summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/inc/fldmgr.hxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-08-23 09:51:41 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-08-23 09:51:41 +0000
commitacafc0f43bade24dbf23e2cf17e73eedda3b43d3 (patch)
tree50133c8edbcb6cab262accb95acf5f0e9299d37c /sw/source/ui/inc/fldmgr.hxx
parentINTEGRATION: CWS tune03 (1.2.82); FILE MERGED (diff)
downloadcore-acafc0f43bade24dbf23e2cf17e73eedda3b43d3.tar.gz
core-acafc0f43bade24dbf23e2cf17e73eedda3b43d3.zip
INTEGRATION: CWS tune03 (1.10.6); FILE MERGED
2004/07/19 19:11:26 mhu 1.10.6.1: #i29979# Added SW_DLLPUBLIC/PRIVATE (see swdllapi.h) to exported symbols/classes.
Diffstat (limited to 'sw/source/ui/inc/fldmgr.hxx')
-rw-r--r--sw/source/ui/inc/fldmgr.hxx23
1 files changed, 14 insertions, 9 deletions
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index 22d5180fdcef..0042b9029d94 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fldmgr.hxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: obo $ $Date: 2004-08-12 13:04:08 $
+ * last change: $Author: rt $ $Date: 2004-08-23 10:51:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,7 +70,13 @@
#include <tools/string.hxx>
#endif
+#ifndef INCLUDED_SWDLLAPI_H
+#include "swdllapi.h"
+#endif
+
+#ifndef _SWTYPES_HXX
#include "swtypes.hxx"
+#endif
#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
#include <com/sun/star/uno/Reference.h>
@@ -78,6 +84,7 @@
#ifndef _COM_SUN_STAR_UNO_ANY_H_
#include <com/sun/star/uno/Any.h>
#endif
+
namespace com{namespace sun{namespace star{
namespace container{
class XNameAccess;
@@ -153,7 +160,8 @@ struct SwInsertFld_Data
bIsAutomaticLanguage(TRUE){}
};
-class SwFldMgr
+
+class SW_DLLPUBLIC SwFldMgr
{
private:
SwField* pCurFld;
@@ -170,11 +178,12 @@ private:
ULONG nCurFmt;
BOOL bEvalExp;
- USHORT GetCurrLanguage() const;
+ SW_DLLPRIVATE USHORT GetCurrLanguage() const;
com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext;
com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo;
- com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
+ SW_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
+
public:
SwFldMgr(SwWrtShell* pSh = 0);
~SwFldMgr();
@@ -254,10 +263,6 @@ public:
//
inline void SetEvalExpFlds(BOOL bEval);
void EvalExpFlds(SwWrtShell* pSh = NULL);
-
- // public, damit sie im fldini initialisiert werden koennen.
- static String *pDate, *pTime;
-
};
inline void SwFldMgr::SetEvalExpFlds(BOOL bEval)