[Libreoffice-commits] core.git: 22 commits - comphelper/source cppuhelper/test cppu/source dbaccess/qa framework/inc framework/source reportdesign/inc sc/inc sc/source sd/source sfx2/source svx/source sw/inc sw/source toolkit/source tools/source unotools/source vcl/inc vcl/source vcl/unx winaccessibility/inc writerfilter/inc writerfilter/source xmloff/inc xmloff/source
Stephan Bergmann
sbergman at redhat.com
Mon Feb 3 07:05:47 PST 2014
comphelper/source/property/opropertybag.hxx | 2
cppu/source/AffineBridge/AffineBridge.cxx | 6
cppu/source/UnsafeBridge/UnsafeBridge.cxx | 2
cppu/source/helper/purpenv/Proxy.hxx | 4
cppu/source/uno/EnvStack.cxx | 4
cppuhelper/test/bootstrap/TestEnv.cxx | 2
dbaccess/qa/extras/dialog-save.cxx | 8 +
framework/inc/fwidllapi.h | 1
framework/source/fwi/threadhelp/transactionmanager.cxx | 1
reportdesign/inc/dllapi.h | 1
sc/inc/autoform.hxx | 4
sc/inc/dpobject.hxx | 10 -
sc/inc/scdllapi.h | 1
sc/inc/userlist.hxx | 2
sc/source/ui/inc/autofmt.hxx | 32 ++--
sc/source/ui/inc/csvgrid.hxx | 54 +++----
sc/source/ui/inc/csvruler.hxx | 40 ++---
sc/source/ui/inc/csvtablebox.hxx | 18 +-
sc/source/ui/inc/docsh.hxx | 44 +++---
sc/source/ui/inc/tphfedit.hxx | 2
sc/source/ui/inc/viewdata.hxx | 18 +-
sd/source/ui/dlg/sdtreelb.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/view/viewsh.cxx | 2
svx/source/inc/fmshimp.hxx | 10 -
svx/source/inc/formcontroller.hxx | 2
svx/source/inc/tabwin.hxx | 8 -
svx/source/svdraw/svdouno.cxx | 2
sw/inc/crsrsh.hxx | 22 +--
sw/inc/dbmgr.hxx | 14 +-
sw/inc/ddefld.hxx | 2
sw/inc/docsh.hxx | 58 ++++----
sw/inc/docstyle.hxx | 4
sw/inc/editsh.hxx | 8 -
sw/inc/fesh.hxx | 28 ++--
sw/inc/fldbas.hxx | 4
sw/inc/fmtclds.hxx | 2
sw/inc/fmtfld.hxx | 4
sw/inc/frmfmt.hxx | 4
sw/inc/ndhints.hxx | 6
sw/inc/ndtxt.hxx | 42 +++---
sw/inc/numrule.hxx | 4
sw/inc/pagedesc.hxx | 6
sw/inc/section.hxx | 12 -
sw/inc/swdbtoolsclient.hxx | 10 -
sw/inc/swddllapi.h | 1
sw/inc/swdllapi.h | 1
sw/inc/tblafmt.hxx | 4
sw/inc/tox.hxx | 10 -
sw/inc/txtatr.hxx | 2
sw/inc/txtinet.hxx | 2
sw/inc/viewsh.hxx | 14 +-
sw/source/core/inc/UndoCore.hxx | 4
sw/source/core/inc/UndoInsert.hxx | 2
sw/source/core/inc/UndoSection.hxx | 4
sw/source/core/undo/unsect.cxx | 4
sw/source/ui/dbui/mmoutputpage.hxx | 20 +-
sw/source/ui/inc/condedit.hxx | 4
sw/source/ui/inc/dbconfig.hxx | 2
sw/source/ui/inc/dbtree.hxx | 10 -
sw/source/ui/inc/fldmgr.hxx | 4
sw/source/ui/inc/fontcfg.hxx | 2
sw/source/ui/inc/frmmgr.hxx | 10 -
sw/source/ui/inc/glosdoc.hxx | 8 -
sw/source/ui/inc/gloshdl.hxx | 4
sw/source/ui/inc/numfmtlb.hxx | 8 -
sw/source/ui/inc/prcntfld.hxx | 2
sw/source/ui/inc/pview.hxx | 26 +--
sw/source/ui/inc/redlndlg.hxx | 38 ++---
sw/source/ui/inc/swlbox.hxx | 6
sw/source/ui/inc/tablemgr.hxx | 2
sw/source/ui/inc/toxmgr.hxx | 2
sw/source/ui/inc/uinums.hxx | 2
sw/source/ui/inc/unotools.hxx | 8 -
sw/source/ui/inc/view.hxx | 104 +++++++--------
sw/source/ui/inc/wordcountdialog.hxx | 2
sw/source/ui/inc/wrtsh.hxx | 66 ++++-----
toolkit/source/awt/vclxwindow.cxx | 2
tools/source/debug/debug.cxx | 3
unotools/source/misc/closeveto.cxx | 4
vcl/inc/print.h | 2
vcl/source/gdi/pdfextoutdevdata.cxx | 8 -
vcl/unx/kde/salnativewidgets-kde.cxx | 6
winaccessibility/inc/UAccCOMdllapi.h | 1
writerfilter/inc/WriterFilterDllApi.hxx | 3
writerfilter/source/dmapper/BorderHandler.hxx | 2
writerfilter/source/dmapper/CellColorHandler.hxx | 2
writerfilter/source/dmapper/CellMarginHandler.hxx | 2
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2
writerfilter/source/dmapper/FontTable.hxx | 2
writerfilter/source/dmapper/GraphicHelpers.hxx | 6
writerfilter/source/dmapper/GraphicImport.hxx | 2
writerfilter/source/dmapper/MeasureHandler.hxx | 2
writerfilter/source/dmapper/ModelEventListener.hxx | 2
writerfilter/source/dmapper/OLEHandler.hxx | 2
writerfilter/source/dmapper/PageBordersHandler.hxx | 2
writerfilter/source/dmapper/SectionColumnHandler.hxx | 2
writerfilter/source/dmapper/SettingsTable.hxx | 2
writerfilter/source/dmapper/StyleSheetTable.hxx | 2
writerfilter/source/dmapper/TDefTableHandler.hxx | 2
writerfilter/source/dmapper/TablePositionHandler.hxx | 2
writerfilter/source/dmapper/TblStylePrHandler.hxx | 2
writerfilter/source/dmapper/ThemeTable.hxx | 2
xmloff/inc/RDFaExportHelper.hxx | 2
xmloff/inc/RDFaImportHelper.hxx | 2
xmloff/source/core/RDFaImportHelper.cxx | 8 -
xmloff/source/core/xmlexp.cxx | 4
xmloff/source/core/xmlimp.cxx | 4
xmloff/source/text/XMLPropertyBackpatcher.cxx | 2
xmloff/source/text/txtimp.cxx | 2
112 files changed, 494 insertions(+), 495 deletions(-)
New commits:
commit b9fbf2b3a546d7d5a425692b8d5f4a43bc297a7a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 15:14:56 2014 +0100
Remove needless SAL_DLLPRIVATE annotations
Change-Id: I6a85d226bd9f61eb4e348ed34ec556762de7b023
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index dbc0133..56e4c0a 100644
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
@@ -37,7 +37,7 @@ class SvXMLExport;
namespace xmloff {
-class SAL_DLLPRIVATE RDFaExportHelper
+class RDFaExportHelper
{
private:
SvXMLExport & m_rExport;
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index 9fdeaaa..75c10dd 100644
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
@@ -40,7 +40,7 @@ namespace xmloff {
struct RDFaEntry;
struct ParsedRDFaAttributes;
-class SAL_DLLPRIVATE RDFaImportHelper
+class RDFaImportHelper
{
private:
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 55372d4..81ef976 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
namespace xmloff {
/** a bit of context for parsing RDFa attributes */
-class SAL_DLLPRIVATE RDFaReader
+class RDFaReader
{
const SvXMLImport & m_rImport;
@@ -84,7 +84,7 @@ public:
};
/** helper to insert RDFa statements into the RDF repository */
-class SAL_DLLPRIVATE RDFaInserter
+class RDFaInserter
{
const uno::Reference<uno::XComponentContext> m_xContext;
uno::Reference< rdf::XDocumentRepository > m_xRepository;
@@ -114,7 +114,7 @@ public:
};
/** store parsed RDFa attributes */
-struct SAL_DLLPRIVATE ParsedRDFaAttributes
+struct ParsedRDFaAttributes
{
OUString m_About;
::std::vector< OUString > m_Properties;
@@ -134,7 +134,7 @@ struct SAL_DLLPRIVATE ParsedRDFaAttributes
};
/** store metadatable object and its RDFa attributes */
-struct SAL_DLLPRIVATE RDFaEntry
+struct RDFaEntry
{
uno::Reference<rdf::XMetadatable> m_xObject;
::boost::shared_ptr<ParsedRDFaAttributes> m_pRDFaAttributes;
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 0c9e3dc..28e9af2 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -138,7 +138,7 @@ const XMLServiceMapEntry_Impl aServiceMap[] =
{ 0, 0, 0, 0 }
};
-class SAL_DLLPRIVATE SettingsExportFacade : public ::xmloff::XMLSettingsExportContext
+class SettingsExportFacade : public ::xmloff::XMLSettingsExportContext
{
public:
SettingsExportFacade( SvXMLExport& i_rExport )
@@ -236,7 +236,7 @@ void SAL_CALL SvXMLExportEventListener::disposing( const lang::EventObject& )
}
}
-class SAL_DLLPRIVATE SvXMLExport_Impl
+class SvXMLExport_Impl
{
public:
SvXMLExport_Impl();
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index fdab947..001970b 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -244,7 +244,7 @@ getBuildIdsProperty(uno::Reference<beans::XPropertySet> const& xImportInfo)
};
}
-class SAL_DLLPRIVATE SvXMLImport_Impl
+class SvXMLImport_Impl
{
public:
FontToSubsFontConverter hBatsFontConv;
@@ -1863,7 +1863,7 @@ void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc,
}
}
-SAL_DLLPRIVATE ::xmloff::RDFaImportHelper &
+::xmloff::RDFaImportHelper &
SvXMLImport::GetRDFaImportHelper()
{
if (!mpImpl->mpRDFaHelper.get())
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 7960097..270b446 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -152,7 +152,7 @@ void XMLPropertyBackpatcher<A>::SetDefault()
template class XMLPropertyBackpatcher<sal_Int16>;
template class XMLPropertyBackpatcher<OUString>;
-struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl
+struct XMLTextImportHelper::BackpatcherImpl
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
/// backpatcher for references to footnotes and endnotes
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 8226f14..0f47e71 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -481,7 +481,7 @@ static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
// maximum allowed length of combined characters field
#define MAX_COMBINED_CHARACTERS 6
-struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
+struct XMLTextImportHelper::Impl
: private ::boost::noncopyable
{
boost::scoped_ptr<SvXMLTokenMap> m_pTextElemTokenMap;
commit 6b2ea525ff2e876e89c27a478daad4a612caac78
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 15:12:29 2014 +0100
Remove needless WRITERFILTER_DLLPRIVATE annotations
Change-Id: I8149471775d623f52231d12f05a28e98b33fae6a
diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx
index b9caa74..6c9425b 100644
--- a/writerfilter/inc/WriterFilterDllApi.hxx
+++ b/writerfilter/inc/WriterFilterDllApi.hxx
@@ -58,9 +58,6 @@
#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-// This one can be shared
-#define WRITERFILTER_DLLPRIVATE SAL_DLLPRIVATE
-
#endif /* INCLUDED_WRITERFILTERDLLAPI_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 692d7ca..7b52962 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -29,7 +29,7 @@ namespace writerfilter {
namespace dmapper
{
class PropertyMap;
-class WRITERFILTER_DLLPRIVATE BorderHandler : public LoggedProperties
+class BorderHandler : public LoggedProperties
{
public:
//todo: order is a guess
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index e3e1c0b..1683d50 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -29,7 +29,7 @@ namespace writerfilter {
namespace dmapper
{
class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE CellColorHandler : public LoggedProperties
+class CellColorHandler : public LoggedProperties
{
public:
enum OutputFormat { Form, Paragraph, Character }; // for what part of the document
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index abde168..902ef80 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -28,7 +28,7 @@ namespace writerfilter {
namespace dmapper
{
class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE CellMarginHandler : public LoggedProperties
+class CellMarginHandler : public LoggedProperties
{
private:
sal_Int32 m_nValue; ///< Converted value.
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 7e248de..3bc66fa 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -256,7 +256,7 @@ void lcl_debug_TableBorder(table::TableBorder & rBorder)
}
#endif
-struct WRITERFILTER_DLLPRIVATE TableInfo
+struct TableInfo
{
sal_Int32 nLeftBorderDistance;
sal_Int32 nRightBorderDistance;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 4536aac..320fcc4 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -65,7 +65,7 @@ struct HorizontallyMergedCell
}
};
-class WRITERFILTER_DLLPRIVATE DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr >
+class DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr >
{
TextReference_t m_xText;
DomainMapper_Impl& m_rDMapper_Impl;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index c102506..0a14054 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -285,7 +285,7 @@ struct FloatingTableInfo
};
class DomainMapper;
-class WRITERFILTER_DLLPRIVATE DomainMapper_Impl
+class DomainMapper_Impl
{
public:
typedef TableManager< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >, PropertyMapPtr > TableManager_t;
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 2cb7e3f..9ea59ae 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -54,7 +54,7 @@ struct FontEntry
{}
};
-class WRITERFILTER_DLLPRIVATE FontTable : public LoggedProperties, public LoggedTable
+class FontTable : public LoggedProperties, public LoggedTable
/*,public BinaryObj*/, public LoggedStream
{
FontTable_Impl *m_pImpl;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 97b2652..88d09de 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -31,7 +31,7 @@ namespace writerfilter {
namespace dmapper
{
-class WRITERFILTER_DLLPRIVATE PositionHandler: public LoggedProperties
+class PositionHandler: public LoggedProperties
{
public:
PositionHandler( bool vertical );
@@ -54,7 +54,7 @@ public:
};
typedef boost::shared_ptr<PositionHandler> PositionHandlerPtr;
-class WRITERFILTER_DLLPRIVATE WrapHandler: public LoggedProperties
+class WrapHandler: public LoggedProperties
{
public:
WrapHandler( );
@@ -71,7 +71,7 @@ public:
};
typedef boost::shared_ptr<WrapHandler> WrapHandlerPtr;
-class WRITERFILTER_DLLPRIVATE GraphicZOrderHelper
+class GraphicZOrderHelper
{
public:
void addItem( uno::Reference< beans::XPropertySet > props, sal_Int32 relativeHeight );
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 7e4cef2..a3ffbe4 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -60,7 +60,7 @@ enum GraphicImportType
IMPORT_AS_DETECTED_ANCHOR
};
-class WRITERFILTER_DLLPRIVATE GraphicImport : public LoggedProperties, public LoggedTable
+class GraphicImport : public LoggedProperties, public LoggedTable
,public BinaryObj, public LoggedStream
{
GraphicImport_Impl* m_pImpl;
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index b1e7c57..619532b 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -31,7 +31,7 @@ namespace dmapper
- Left indent of tables
- Preferred width of tables
*/
-class WRITERFILTER_DLLPRIVATE MeasureHandler : public LoggedProperties
+class MeasureHandler : public LoggedProperties
{
sal_Int32 m_nMeasureValue;
sal_Int32 m_nUnit;
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index e10be88..dd18c13 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -27,7 +27,7 @@ namespace writerfilter {
namespace dmapper{
-class WRITERFILTER_DLLPRIVATE ModelEventListener :
+class ModelEventListener :
public cppu::WeakImplHelper1< ::com::sun::star::document::XEventListener >
{
bool m_bIndexes;
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 63e9207..d3e3b1f 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -43,7 +43,7 @@ namespace dmapper
{
/** Handler for OLE objects
*/
-class WRITERFILTER_DLLPRIVATE OLEHandler : public LoggedProperties
+class OLEHandler : public LoggedProperties
{
OUString m_sObjectType;
OUString m_sProgId;
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index b6aebf5..6e9d598 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -46,7 +46,7 @@ public:
~_PgBorder( );
};
-class WRITERFILTER_DLLPRIVATE PageBordersHandler : public LoggedProperties
+class PageBordersHandler : public LoggedProperties
{
private:
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index 43f70a1..317e98d 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -34,7 +34,7 @@ struct _Column
};
-class WRITERFILTER_DLLPRIVATE SectionColumnHandler : public LoggedProperties
+class SectionColumnHandler : public LoggedProperties
{
bool bEqualWidth;
sal_Int32 nSpace;
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 1679944..6c619c9 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -42,7 +42,7 @@ using namespace std;
struct SettingsTable_Impl;
-class WRITERFILTER_DLLPRIVATE SettingsTable : public LoggedProperties, public LoggedTable
+class SettingsTable : public LoggedProperties, public LoggedTable
{
SettingsTable_Impl *m_pImpl;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index e9faba7..f483eef8 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -122,7 +122,7 @@ private:
typedef boost::shared_ptr< StyleSheetTable > StyleSheetTablePtr;
-class WRITERFILTER_DLLPRIVATE TableStyleSheetEntry :
+class TableStyleSheetEntry :
public StyleSheetEntry
{
private:
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 11be966..ebfc545 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -37,7 +37,7 @@ namespace dmapper
{
class PropertyMap;
class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE TDefTableHandler : public LoggedProperties
+class TDefTableHandler : public LoggedProperties
{
public:
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index bfd636e..b04b090 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -20,7 +20,7 @@ namespace dmapper
{
/// Handler for floating table positioning
-class WRITERFILTER_DLLPRIVATE TablePositionHandler
+class TablePositionHandler
: public LoggedProperties
{
OUString m_aVertAnchor;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index a7abf77..eed2c0e 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -50,7 +50,7 @@ enum TblStyleType
TBL_STYLE_SWCELL
};
-class WRITERFILTER_DLLPRIVATE TblStylePrHandler : public LoggedProperties
+class TblStylePrHandler : public LoggedProperties
{
private:
DomainMapper & m_rDMapper;
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 190da85..dedcede 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -33,7 +33,7 @@ namespace dmapper
struct ThemeTable_Impl;
-class WRITERFILTER_DLLPRIVATE ThemeTable : public LoggedProperties, public LoggedTable
+class ThemeTable : public LoggedProperties, public LoggedTable
{
ThemeTable_Impl *m_pImpl;
commit f27ef6de0b4ec00be550497052b1147aff255506
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 15:06:49 2014 +0100
Unused UACCCOM_DLLPRIVATE
Change-Id: Id9e0db7f357c1ebbabf386f72e3817639bab0604
diff --git a/winaccessibility/inc/UAccCOMdllapi.h b/winaccessibility/inc/UAccCOMdllapi.h
index aca29b6..cb7f226 100644
--- a/winaccessibility/inc/UAccCOMdllapi.h
+++ b/winaccessibility/inc/UAccCOMdllapi.h
@@ -17,7 +17,6 @@
#else
#define UACCCOM_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#define UACCCOM_DLLPRIVATE SAL_DLLPRIVATE
#endif
commit b7f448ded4bd99c92c554e9476f75555ea3e4b42
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 15:05:33 2014 +0100
bool improvements
Change-Id: I2f81497a830c8e1802ffbeeb362cea16e8b731d7
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 26c7245..8d458e5 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1278,7 +1278,7 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP
{
// make position relative to rControlRegion
Point aPos = rPos - rControlRegion.TopLeft();
- rIsInside = sal_False;
+ rIsInside = false;
sal_Bool bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT );
@@ -1322,7 +1322,7 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP
{
case PART_BUTTON_LEFT:
if ( !bPlatinumStyle && qRectSubLine.contains( aPos.getX(), aPos.getY() ) )
- rIsInside = sal_True;
+ rIsInside = true;
else if ( bTwoSubButtons )
{
qRectAddLine.setWidth( qRectAddLine.width() / 2 );
@@ -1332,7 +1332,7 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP
case PART_BUTTON_UP:
if ( !bPlatinumStyle && qRectSubLine.contains( aPos.getX(), aPos.getY() ) )
- rIsInside = sal_True;
+ rIsInside = true;
else if ( bTwoSubButtons )
{
qRectAddLine.setHeight( qRectAddLine.height() / 2 );
commit c3b0c8f4ac0fc7f831eff15c76d1e5a169f92428
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 15:00:11 2014 +0100
Remove needless SAL_DLLPRIVATE annotations
Change-Id: I21de72679205c9ba8fd7b7014c4ff81a72587b0a
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index 4453f33..219f0af 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -54,7 +54,7 @@ public:
};
void ImplDeletePrnQueueList();
-void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
+void ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
#endif // INCLUDED_VCL_INC_PRINT_H
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index a06315f..30f1186 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -32,7 +32,7 @@
namespace vcl
{
-struct SAL_DLLPRIVATE PDFExtOutDevDataSync
+struct PDFExtOutDevDataSync
{
enum Action{ CreateNamedDest,
CreateDest,
@@ -66,7 +66,7 @@ struct SAL_DLLPRIVATE PDFExtOutDevDataSync
Action eAct;
};
-struct SAL_DLLPRIVATE PDFLinkDestination
+struct PDFLinkDestination
{
Rectangle mRect;
MapMode mMapMode;
@@ -74,7 +74,7 @@ struct SAL_DLLPRIVATE PDFLinkDestination
PDFWriter::DestAreaType mAreaType;
};
-struct SAL_DLLPRIVATE GlobalSyncData
+struct GlobalSyncData
{
std::deque< PDFExtOutDevDataSync::Action > mActions;
std::deque< MapMode > mParaMapModes;
@@ -285,7 +285,7 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
}
}
-struct SAL_DLLPRIVATE PageSyncData
+struct PageSyncData
{
std::deque< PDFExtOutDevDataSync > mActions;
std::deque< Rectangle > mParaRects;
commit 961b42ca1e88b96b468b46f7204ec5d3e86c4b6c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:55:56 2014 +0100
Remove needless SAL_DLLPRIVATE annotations
Change-Id: I6b560474e38230a0c8b6ba3be0bbffe9e7dcae48
diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx
index e361f4a..24a084d 100644
--- a/unotools/source/misc/closeveto.cxx
+++ b/unotools/source/misc/closeveto.cxx
@@ -51,7 +51,7 @@ namespace utl
//==================================================================================================================
typedef ::cppu::WeakImplHelper1 < XCloseListener
> CloseListener_Base;
- class SAL_DLLPRIVATE CloseListener_Impl : public CloseListener_Base
+ class CloseListener_Impl : public CloseListener_Base
{
public:
CloseListener_Impl()
@@ -103,7 +103,7 @@ namespace utl
//==================================================================================================================
//= CloseVeto_Data
//==================================================================================================================
- struct SAL_DLLPRIVATE CloseVeto_Data
+ struct CloseVeto_Data
{
Reference< XCloseable > xCloseable;
::rtl::Reference< CloseListener_Impl > pListener;
commit d2564a4a101cefa5cf1266729cf12e14d17ce497
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:55:06 2014 +0100
Remove needless SAL_DLLPRIVATE annotation
Change-Id: Id322e7ca57205083a5585081df86bfac933b7bb6
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index d4bfc9a..5b4d51e 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -83,7 +83,7 @@ namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior;
//====================================================================
//= VCLXWindowImpl
//====================================================================
-class SAL_DLLPRIVATE VCLXWindowImpl
+class VCLXWindowImpl
{
private:
typedef ::std::vector< VCLXWindow::Callback > CallbackArray;
commit 843d3a9d87a784d202bcd06cfc69f84e4c2aa480
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:43:37 2014 +0100
Remove SW_DLLPRIVATE -> SAL_DLLPRIVATE indirection
Change-Id: I5498266e5496f196d420a2897b804da8599917b5
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 978d6b6..adf3319 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -232,11 +232,11 @@ private:
SwFrm* m_oldColFrm;
- SW_DLLPRIVATE void UpdateCrsr(
+ SAL_DLLPRIVATE void UpdateCrsr(
sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
sal_Bool bIdleEnd = sal_False );
- SW_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
+ SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
/** Mark a certain list level of a certain list
@@ -247,23 +247,23 @@ private:
An empty sListId denotes that no level of a list is marked.
*/
- SW_DLLPRIVATE void MarkListLevel( const OUString& sListId,
+ SAL_DLLPRIVATE void MarkListLevel( const OUString& sListId,
const int nLevel );
// private method(s) accessed from public inline method(s) must be exported.
sal_Bool LeftRight( sal_Bool, sal_uInt16, sal_uInt16, sal_Bool );
- SW_DLLPRIVATE sal_Bool UpDown( sal_Bool, sal_uInt16 );
- SW_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False );
- SW_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const;
+ SAL_DLLPRIVATE sal_Bool UpDown( sal_Bool, sal_uInt16 );
+ SAL_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False );
+ SAL_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const;
- SW_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
+ SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
- SW_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
+ SAL_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
typedef sal_Bool (SwCursor:: *FNCrsr)();
- SW_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr );
+ SAL_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr );
- SW_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect );
+ SAL_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect );
protected:
@@ -296,7 +296,7 @@ protected:
/** Updates the marked list level according to the cursor.
*/
- SW_DLLPRIVATE void UpdateMarkedListLevel();
+ SAL_DLLPRIVATE void UpdateMarkedListLevel();
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index f99468d..009584f 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -202,22 +202,22 @@ friend class SwConnectionDisposedListener_Impl;
SwNewDBMgr_Impl* pImpl;
const SwXMailMerge* pMergeEvtSrc; ///< != 0 if mail merge events are to be send
- SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate);
- SW_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, sal_Bool bCreate);
+ SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate);
+ SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, sal_Bool bCreate);
- SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
+ SAL_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
/// Insert data record as text into document.
- SW_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
+ SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
/// Insert a single data record as text into document.
- SW_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
+ SAL_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
/// merge to file _and_ merge to e-Mail
- SW_DLLPRIVATE sal_Bool MergeMailFiles(SwWrtShell* pSh,
+ SAL_DLLPRIVATE sal_Bool MergeMailFiles(SwWrtShell* pSh,
const SwMergeDescriptor& rMergeDescriptor );
- SW_DLLPRIVATE sal_Bool ToNextRecord(SwDSParam* pParam);
+ SAL_DLLPRIVATE sal_Bool ToNextRecord(SwDSParam* pParam);
public:
SwNewDBMgr();
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 867d1e2..97dfe92 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType
sal_Bool bCRLFFlag : 1;
sal_Bool bDeleted : 1;
- SW_DLLPRIVATE void _RefCntChgd();
+ SAL_DLLPRIVATE void _RefCntChgd();
public:
SwDDEFieldType( const OUString& rName, const OUString& rCmd,
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 308811e..20dfcea 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -76,39 +76,39 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
bool bIsATemplate; ///< prevent nested calls of UpdateFontList
/// Methods for access to doc.
- SW_DLLPRIVATE void AddLink();
- SW_DLLPRIVATE void RemoveLink();
+ SAL_DLLPRIVATE void AddLink();
+ SAL_DLLPRIVATE void RemoveLink();
/// Catch hint for DocInfo.
- SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
/// FileIO
- SW_DLLPRIVATE virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- SW_DLLPRIVATE virtual sal_Bool Load( SfxMedium& rMedium );
- SW_DLLPRIVATE virtual sal_Bool LoadFrom( SfxMedium& rMedium );
- SW_DLLPRIVATE virtual sal_Bool ConvertFrom( SfxMedium &rMedium );
- SW_DLLPRIVATE virtual sal_Bool ConvertTo( SfxMedium &rMedium );
- SW_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
- SW_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ SAL_DLLPRIVATE virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ SAL_DLLPRIVATE virtual sal_Bool Load( SfxMedium& rMedium );
+ SAL_DLLPRIVATE virtual sal_Bool LoadFrom( SfxMedium& rMedium );
+ SAL_DLLPRIVATE virtual sal_Bool ConvertFrom( SfxMedium &rMedium );
+ SAL_DLLPRIVATE virtual sal_Bool ConvertTo( SfxMedium &rMedium );
+ SAL_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
+ SAL_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- SW_DLLPRIVATE virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
- SW_DLLPRIVATE virtual bool InsertGeneratedStream(SfxMedium& rMedium,
+ SAL_DLLPRIVATE virtual bool InsertGeneratedStream(SfxMedium& rMedium,
css::uno::Reference<css::text::XTextRange> const& xInsertPosition)
SAL_OVERRIDE;
/// Make DocInfo known to the Doc.
- SW_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
+ SAL_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
Window *pParent, const SfxItemSet &);
/// OLE-stuff
- SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16);
+ SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16);
/// Methods for StyleSheets
// @param nSlot
// Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered.
// Used to activate certain dialog pane
- SW_DLLPRIVATE sal_uInt16 Edit(
+ SAL_DLLPRIVATE sal_uInt16 Edit(
const OUString &rName,
const OUString& rParent,
const sal_uInt16 nFamily,
@@ -118,23 +118,23 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SwWrtShell* pActShell = 0,
const sal_Bool bBasic = sal_False );
- SW_DLLPRIVATE sal_uInt16 Delete(const OUString &rName, sal_uInt16 nFamily);
- SW_DLLPRIVATE sal_uInt16 Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden);
- SW_DLLPRIVATE sal_uInt16 ApplyStyles(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
+ SAL_DLLPRIVATE sal_uInt16 Delete(const OUString &rName, sal_uInt16 nFamily);
+ SAL_DLLPRIVATE sal_uInt16 Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden);
+ SAL_DLLPRIVATE sal_uInt16 ApplyStyles(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
sal_uInt16 nMode = 0 );
- SW_DLLPRIVATE sal_uInt16 DoWaterCan( const OUString &rName, sal_uInt16 nFamily);
- SW_DLLPRIVATE sal_uInt16 UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0);
- SW_DLLPRIVATE sal_uInt16 MakeByExample(const OUString &rName,
+ SAL_DLLPRIVATE sal_uInt16 DoWaterCan( const OUString &rName, sal_uInt16 nFamily);
+ SAL_DLLPRIVATE sal_uInt16 UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0);
+ SAL_DLLPRIVATE sal_uInt16 MakeByExample(const OUString &rName,
sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0);
- SW_DLLPRIVATE void InitDraw();
- SW_DLLPRIVATE void SubInitNew(); ///< for InitNew and HtmlSourceMode.
+ SAL_DLLPRIVATE void InitDraw();
+ SAL_DLLPRIVATE void SubInitNew(); ///< for InitNew and HtmlSourceMode.
- SW_DLLPRIVATE void RemoveOLEObjects();
- SW_DLLPRIVATE void CalcLayoutForOLEObjects();
+ SAL_DLLPRIVATE void RemoveOLEObjects();
+ SAL_DLLPRIVATE void CalcLayoutForOLEObjects();
- SW_DLLPRIVATE void Init_Impl();
- SW_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
+ SAL_DLLPRIVATE void Init_Impl();
+ SAL_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
using SfxObjectShell::GetVisArea;
@@ -296,8 +296,8 @@ public:
GetController();
SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef );
- SW_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
- SW_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
+ SAL_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
+ SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index a08ff60..f213eef 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -68,7 +68,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
/// Make empty shell a real StyleSheet (Core).
- SW_DLLPRIVATE void Create();
+ SAL_DLLPRIVATE void Create();
/// Fill StyleSheet with data.
enum FillStyleType {
@@ -77,7 +77,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
FillPhysical
};
- SW_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType );
+ SAL_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType );
protected:
virtual ~SwDocStyleSheet();
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index a50b1fd..58bf231 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -149,15 +149,15 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
/// For the PamCorrAbs/-Rel methods.
friend class SwUndo;
- SW_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const;
+ SAL_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const;
/** Returns pointer to a SwGrfNode
that will be used by GetGraphic() and GetGraphicSize(). */
- SW_DLLPRIVATE SwGrfNode *_GetGrfNode() const ;
+ SAL_DLLPRIVATE SwGrfNode *_GetGrfNode() const ;
- SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 );
+ SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 );
- SW_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
+ SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
using SwViewShell::UpdateFlds;
using SwModify::GetInfo;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 8f16c0d..7877ac99 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -171,41 +171,41 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
SdrDropMarkerOverlay *pChainFrom, *pChainTo;
sal_Bool bCheckForOLEInCaption;
- SW_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
- SW_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
+ SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
+ SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
/// Terminate actions for all shells and call ChangeLink.
- SW_DLLPRIVATE void EndAllActionAndCall();
+ SAL_DLLPRIVATE void EndAllActionAndCall();
- SW_DLLPRIVATE void ScrollTo( const Point &rPt );
+ SAL_DLLPRIVATE void ScrollTo( const Point &rPt );
- SW_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
+ SAL_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
/** Used for mouse operations on a table:
@return a cell frame that is 'close' to rPt. */
- SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const;
+ SAL_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const;
// 0 == not in any column.
- SW_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
+ SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
SwGetCurColNumPara* pPara ) const;
- SW_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const;
- SW_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const;
+ SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const;
+ SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const;
- SW_DLLPRIVATE sal_Bool ImpEndCreate();
+ SAL_DLLPRIVATE sal_Bool ImpEndCreate();
- SW_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const;
+ SAL_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const;
/// Methods for copying of draw objects.
- SW_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
+ SAL_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
const Point& rInsPt, sal_Bool bIsMove,
sal_Bool bSelectInsert );
/// Get list of marked SdrObjects;
/// helper method for GetSelFrmType, IsSelContainsControl.
- SW_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
+ SAL_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
- SW_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
+ SAL_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
using SwEditShell::Copy;
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 1e20918..29dae27 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -252,10 +252,10 @@ protected:
public:
- SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+ SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::beans::XPropertySet> const& GetXObject() const
{ return m_wXFieldMaster; }
- SW_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
+ SAL_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> const& xFieldMaster)
{ m_wXFieldMaster = xFieldMaster; }
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index e20aee5..0e733d7 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -88,7 +88,7 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
When it is set (again) the visual arrangement is recalculated.
The flag is initially set. */
- SW_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
+ SAL_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
public:
SwFmtCol();
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index b545328..46021a44 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -106,10 +106,10 @@ public:
bool IsFldInDoc() const;
sal_Bool IsProtect() const;
- SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+ SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextField> const& GetXTextField() const
{ return m_wXTextField; }
- SW_DLLPRIVATE void SetXTextField(::com::sun::star::uno::Reference<
+ SAL_DLLPRIVATE void SetXTextField(::com::sun::star::uno::Reference<
::com::sun::star::text::XTextField> const& xTextField)
{ m_wXTextField = xTextField; }
};
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 1b26316..636f0cb 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -129,10 +129,10 @@ public:
void SetCaptionFmt(SwFrmFmt* pFmt);
SwFrmFmt* GetCaptionFmt() const;
- SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+ SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::uno::XInterface> const& GetXObject() const
{ return m_wXObject; }
- SW_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
+ SAL_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface> const& xObject)
{ m_wXObject = xObject; }
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index ea59828..683d154 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -115,25 +115,25 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextContent> m_wXParagraph;
- SW_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
+ SAL_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
const SfxItemSet* pAutoAttr = 0 );
/// Copies the attributes at nStart to pDest.
- SW_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
+ SAL_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
- SW_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, sal_Bool bNext = sal_True,
+ SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, sal_Bool bNext = sal_True,
sal_Bool bChgFollow = sal_True );
- SW_DLLPRIVATE void CutImpl(
+ SAL_DLLPRIVATE void CutImpl(
SwTxtNode * const pDest, const SwIndex & rDestStart,
const SwIndex & rStart, /*const*/ sal_Int32 nLen,
const bool bUpdate = true );
/// Move all comprising hard attributes to the AttrSet of the paragraph.
- SW_DLLPRIVATE void MoveTxtAttr_To_AttrSet(); // Called by SplitNode.
+ SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet(); // Called by SplitNode.
/// Create the specific AttrSet.
- SW_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& );
+ SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& );
/// Optimization: Asking for information about hidden characters at SwScriptInfo
/// updates these flags.
@@ -146,25 +146,25 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
m_bRecalcHiddenCharFlags = false;
}
- SW_DLLPRIVATE void CalcHiddenCharFlags() const;
+ SAL_DLLPRIVATE void CalcHiddenCharFlags() const;
- SW_DLLPRIVATE SwNumRule * _GetNumRule(sal_Bool bInParent = sal_True) const;
+ SAL_DLLPRIVATE SwNumRule * _GetNumRule(sal_Bool bInParent = sal_True) const;
- SW_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM,
+ SAL_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM,
LanguageType nLang, sal_uInt16 nLangWhichId,
const Font *pFont, sal_uInt16 nFontWhichId );
/// Start: Data collected during idle time
- SW_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const;
- SW_DLLPRIVATE sal_uLong GetParaNumberOfWords() const;
- SW_DLLPRIVATE void SetParaNumberOfAsianWords( sal_uLong nTmpAsianWords ) const;
- SW_DLLPRIVATE sal_uLong GetParaNumberOfAsianWords() const;
- SW_DLLPRIVATE void SetParaNumberOfChars( sal_uLong nTmpChars ) const;
- SW_DLLPRIVATE sal_uLong GetParaNumberOfChars() const;
- SW_DLLPRIVATE void SetParaNumberOfCharsExcludingSpaces( sal_uLong nTmpChars ) const;
- SW_DLLPRIVATE sal_uLong GetParaNumberOfCharsExcludingSpaces() const;
- SW_DLLPRIVATE void InitSwParaStatistics( bool bNew );
+ SAL_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const;
+ SAL_DLLPRIVATE sal_uLong GetParaNumberOfWords() const;
+ SAL_DLLPRIVATE void SetParaNumberOfAsianWords( sal_uLong nTmpAsianWords ) const;
+ SAL_DLLPRIVATE sal_uLong GetParaNumberOfAsianWords() const;
+ SAL_DLLPRIVATE void SetParaNumberOfChars( sal_uLong nTmpChars ) const;
+ SAL_DLLPRIVATE sal_uLong GetParaNumberOfChars() const;
+ SAL_DLLPRIVATE void SetParaNumberOfCharsExcludingSpaces( sal_uLong nTmpChars ) const;
+ SAL_DLLPRIVATE sal_uLong GetParaNumberOfCharsExcludingSpaces() const;
+ SAL_DLLPRIVATE void InitSwParaStatistics( bool bNew );
/** create number for this text node, if not already existing
@@ -174,7 +174,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
inline void TryDeleteSwpHints();
- SW_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet);
+ SAL_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet);
const SwTxtInputFld* GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) const;
@@ -772,10 +772,10 @@ public:
sal_uInt16 GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd ) const;
- SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+ SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextContent> const& GetXParagraph() const
{ return m_wXParagraph; }
- SW_DLLPRIVATE void SetXParagraph(::com::sun::star::uno::Reference<
+ SAL_DLLPRIVATE void SetXParagraph(::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent> const& xParagraph)
{ m_wXParagraph = xParagraph; }
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 1dbfbfc..68c9f28 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -52,8 +52,8 @@ class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
SwFmtVertOrient* pVertOrient;
//For i120928,record the cp info of graphic within bullet
sal_Unicode cGrfBulletCP;
- SW_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
- SW_DLLPRIVATE virtual void NotifyGraphicArrived();
+ SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
+ SAL_DLLPRIVATE virtual void NotifyGraphicArrived();
using SvxNumberFormat::operator ==;
using SvxNumberFormat::operator !=;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index b0bccec..9d72b6c 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -151,11 +151,11 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
/** Called for mirroring of Chg (doc).
No adjustment at any other place. */
- SW_DLLPRIVATE void Mirror();
+ SAL_DLLPRIVATE void Mirror();
- SW_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft );
+ SAL_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft );
- SW_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
+ SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue );
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 603ad1e..5a48363 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -106,10 +106,10 @@ public:
void SetHidden(bool const bFlag = true) { m_bHidden = bFlag; }
bool IsHiddenFlag() const { return m_bHiddenFlag; }
- SW_DLLPRIVATE void
+ SAL_DLLPRIVATE void
SetHiddenFlag(bool const bFlag) { m_bHiddenFlag = bFlag; }
bool IsProtectFlag() const { return m_bProtectFlag; }
- SW_DLLPRIVATE void
+ SAL_DLLPRIVATE void
SetProtectFlag(bool const bFlag) { m_bProtectFlag = bFlag; }
bool IsEditInReadonlyFlag() const { return m_bEditInReadonlyFlag; }
void SetEditInReadonlyFlag(bool const bFlag)
@@ -158,7 +158,7 @@ private:
SwServerObjectRef m_RefObj; // Set if DataServer.
::sfx2::SvBaseLinkRef m_RefLink;
- SW_DLLPRIVATE void ImplSetHiddenFlag(
+ SAL_DLLPRIVATE void ImplSetHiddenFlag(
bool const bHidden, bool const bCondition);
protected:
@@ -295,7 +295,7 @@ class SW_DLLPUBLIC SwSectionFmt
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextSection> m_wXTextSection;
- SW_DLLPRIVATE void UpdateParent(); // Parent has been changed.
+ SAL_DLLPRIVATE void UpdateParent(); // Parent has been changed.
protected:
SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc );
@@ -337,10 +337,10 @@ public:
// Is section a valid one for global document?
const SwSection* GetGlobalDocSection() const;
- SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+ SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextSection> const& GetXTextSection() const
{ return m_wXTextSection; }
- SW_DLLPRIVATE void SetXTextSection(::com::sun::star::uno::Reference<
+ SAL_DLLPRIVATE void SetXTextSection(::com::sun::star::uno::Reference<
::com::sun::star::text::XTextSection> const& xTextSection)
{ m_wXTextSection = xTextSection; }
diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx
index 69fa86e..923835a 100644
--- a/sw/inc/swdbtoolsclient.hxx
+++ b/sw/inc/swdbtoolsclient.hxx
@@ -34,12 +34,12 @@ private:
::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > m_xAccessTypeConversion;
::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
- SW_DLLPRIVATE static void registerClient();
- SW_DLLPRIVATE static void revokeClient();
- SW_DLLPRIVATE void getFactory();
+ SAL_DLLPRIVATE static void registerClient();
+ SAL_DLLPRIVATE static void revokeClient();
+ SAL_DLLPRIVATE void getFactory();
- SW_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTools > getDataAccessTools();
- SW_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > getAccessTypeConversion();
+ SAL_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTools > getDataAccessTools();
+ SAL_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > getAccessTypeConversion();
public:
SwDbtoolsClient();
diff --git a/sw/inc/swdllapi.h b/sw/inc/swdllapi.h
index f719ff7..91108f7 100644
--- a/sw/inc/swdllapi.h
+++ b/sw/inc/swdllapi.h
@@ -27,7 +27,6 @@
#else
#define SW_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#define SW_DLLPRIVATE SAL_DLLPRIVATE
#endif // INCLUDED_SW_INC_SWDLLAPI_H
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index edf87d1..d85d5e5 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -302,8 +302,8 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl
struct Impl;
::boost::scoped_ptr<Impl> m_pImpl;
- SW_DLLPRIVATE sal_Bool Load( SvStream& rStream );
- SW_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const;
+ SAL_DLLPRIVATE sal_Bool Load( SvStream& rStream );
+ SAL_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const;
public:
explicit SwTableAutoFmtTbl();
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 9e4efeb..d87198c 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -131,10 +131,10 @@ public:
const SwTxtTOXMark* GetTxtTOXMark() const { return pTxtAttr; }
SwTxtTOXMark* GetTxtTOXMark() { return pTxtAttr; }
- SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+ SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
{ return m_wXDocumentIndexMark; }
- SW_DLLPRIVATE void SetXTOXMark(::com::sun::star::uno::Reference<
+ SAL_DLLPRIVATE void SetXTOXMark(::com::sun::star::uno::Reference<
::com::sun::star::text::XDocumentIndexMark> const& xMark)
{ m_wXDocumentIndexMark = xMark; }
void DeRegister() { GetRegisteredInNonConst()->Remove( this ); }
@@ -269,7 +269,7 @@ class SW_DLLPUBLIC SwFormTokensHelper
@return the token
*/
- SW_DLLPRIVATE SwFormToken BuildToken( const OUString & sPattern,
+ SAL_DLLPRIVATE SwFormToken BuildToken( const OUString & sPattern,
sal_Int32 & nCurPatternPos ) const;
/**
@@ -280,7 +280,7 @@ class SW_DLLPUBLIC SwFormTokensHelper
@return the string representation of the token
*/
- SW_DLLPRIVATE OUString SearchNextToken( const OUString & sPattern,
+ SAL_DLLPRIVATE OUString SearchNextToken( const OUString & sPattern,
sal_Int32 nStt ) const;
/**
@@ -294,7 +294,7 @@ class SW_DLLPUBLIC SwFormTokensHelper
@return the type of the token
*/
- SW_DLLPRIVATE FormTokenType GetTokenType(const OUString & sToken,
+ SAL_DLLPRIVATE FormTokenType GetTokenType(const OUString & sToken,
sal_Int32 * pTokenLen) const;
public:
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 2c87925..c8bd9e6 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -97,7 +97,7 @@ public:
virtual bool GetInfo( SfxPoolItem& rInfo ) const;
- SW_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
+ SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
/// Get and set TxtNode pointer.
const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index f2d7846..85f6cc4 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -44,7 +44,7 @@ public:
virtual bool GetInfo( SfxPoolItem& rInfo ) const;
- SW_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
+ SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
// get and set TxtNode pointer
const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index ccd63e5..a5f142d 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -167,23 +167,23 @@ class SW_DLLPUBLIC SwViewShell : public Ring
SwRootFrmPtr mpLayout;
// Initialization; called by the diverse constructors.
- SW_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
+ SAL_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
inline void ResetInvalidRect();
- SW_DLLPRIVATE void Reformat(); // Invalidates complete Layout (ApplyViewOption).
+ SAL_DLLPRIVATE void Reformat(); // Invalidates complete Layout (ApplyViewOption).
- SW_DLLPRIVATE void PaintDesktop( const SwRect & ); // Collect values for painting of desktop
+ SAL_DLLPRIVATE void PaintDesktop( const SwRect & ); // Collect values for painting of desktop
// and calling.
// PaintDesktop split. This pars is also used by PreviewPage.
- SW_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion );
+ SAL_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion );
- SW_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather
+ SAL_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather
// trigger an action.
- SW_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions );
+ SAL_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions );
- SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
+ SAL_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
protected:
static ShellResource* mpShellRes; ///< Resources for the Shell.
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 8a8c3ba..b18aa7a 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -191,16 +191,16 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog
sal_Int32 m_nSendCount;
sal_Int32 m_nErrorCount;
- SW_DLLPRIVATE DECL_LINK( DetailsHdl_Impl, void* );
- SW_DLLPRIVATE DECL_LINK( StopHdl_Impl, PushButton* );
- SW_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* );
- SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
- SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
- SW_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer* );
-
- SW_DLLPRIVATE void IterateMails();
- SW_DLLPRIVATE void SendMails();
- SW_DLLPRIVATE void UpdateTransferStatus();
+ SAL_DLLPRIVATE DECL_LINK( DetailsHdl_Impl, void* );
+ SAL_DLLPRIVATE DECL_LINK( StopHdl_Impl, PushButton* );
+ SAL_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* );
+ SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
+ SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* );
+ SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer* );
+
+ SAL_DLLPRIVATE void IterateMails();
+ SAL_DLLPRIVATE void SendMails();
+ SAL_DLLPRIVATE void UpdateTransferStatus();
virtual void StateChanged( StateChangedType nStateChange );
diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx
index f358bf1..514a23e 100644
--- a/sw/source/ui/inc/condedit.hxx
+++ b/sw/source/ui/inc/condedit.hxx
@@ -27,8 +27,8 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper
{
bool bBrackets, bEnableDrop;
- SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
public:
ConditionEdit(Window* pParent, WinBits nStyle);
diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx
index e847d48..042a719 100644
--- a/sw/source/ui/inc/dbconfig.hxx
+++ b/sw/source/ui/inc/dbconfig.hxx
@@ -26,7 +26,7 @@ struct SwDBData;
class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem
{
- SW_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+ SAL_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
SwDBData* pAdrImpl;
SwDBData* pBibImpl;
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index 1000e96..7120cbf 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -41,13 +41,13 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
SwDBTreeList_Impl* pImpl;
- SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
+ SAL_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
- SW_DLLPRIVATE void InitTreeList();
- SW_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent );
+ SAL_DLLPRIVATE void InitTreeList();
+ SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent );
- SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
using SvTreeListBox::Select;
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index 784c175..da04b91 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -117,11 +117,11 @@ private:
sal_uLong nCurFmt;
sal_Bool bEvalExp;
- SW_DLLPRIVATE sal_uInt16 GetCurrLanguage() const;
+ SAL_DLLPRIVATE sal_uInt16 GetCurrLanguage() const;
com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext;
com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo;
- SW_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
+ SAL_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
public:
SwFldMgr(SwWrtShell* pSh = 0);
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 265a94f..fd8873f 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
OUString sDefaultFonts[DEF_FONT_COUNT];
sal_Int32 nDefaultFontHeight[DEF_FONT_COUNT];
- SW_DLLPRIVATE com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ SAL_DLLPRIVATE com::sun::star::uno::Sequence<OUString> GetPropertyNames();
void ChangeString(sal_uInt16 nFontType, const OUString& rSet)
{
diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx
index 6e089fb..47ea8b3 100644
--- a/sw/source/ui/inc/frmmgr.hxx
+++ b/sw/source/ui/inc/frmmgr.hxx
@@ -60,12 +60,12 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr
sal_Bool bIsInVerticalL2R;
// internal calculation for borders
- SW_DLLPRIVATE SwTwips CalcTopSpace();
- SW_DLLPRIVATE SwTwips CalcBottomSpace();
- SW_DLLPRIVATE SwTwips CalcLeftSpace();
- SW_DLLPRIVATE SwTwips CalcRightSpace();
+ SAL_DLLPRIVATE SwTwips CalcTopSpace();
+ SAL_DLLPRIVATE SwTwips CalcBottomSpace();
+ SAL_DLLPRIVATE SwTwips CalcLeftSpace();
+ SAL_DLLPRIVATE SwTwips CalcRightSpace();
- SW_DLLPRIVATE void _UpdateFlyFrm(); // post-treatment after insert or update
+ SAL_DLLPRIVATE void _UpdateFlyFrm(); // post-treatment after insert or update
public:
SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nType );
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx
index caba047..80a1c3a 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/ui/inc/glosdoc.hxx
@@ -55,12 +55,12 @@ class SW_DLLPUBLIC SwGlossaries
std::vector<OUString> m_GlosArr;
sal_Bool m_bError;
- SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const OUString &rName, sal_Bool bCreate = sal_True) const;
- SW_DLLPRIVATE std::vector<OUString> & GetNameList();
+ SAL_DLLPRIVATE SwTextBlocks* GetGlosDoc(const OUString &rName, sal_Bool bCreate = sal_True) const;
+ SAL_DLLPRIVATE std::vector<OUString> & GetNameList();
// implementation in unoatxt.cxx
- SW_DLLPRIVATE void RemoveFileFromList( const OUString& rGroup );
- SW_DLLPRIVATE void InvalidateUNOOjects();
+ SAL_DLLPRIVATE void RemoveFileFromList( const OUString& rGroup );
+ SAL_DLLPRIVATE void InvalidateUNOOjects();
public:
SwGlossaries();
diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/ui/inc/gloshdl.hxx
index ab33a9a..2d341fd 100644
--- a/sw/source/ui/inc/gloshdl.hxx
+++ b/sw/source/ui/inc/gloshdl.hxx
@@ -38,11 +38,11 @@ class SW_DLLPUBLIC SwGlossaryHdl
SwWrtShell* pWrtShell;
SwTextBlocks* pCurGrp;
- SW_DLLPRIVATE void _SetMacros(const OUString &rName,
+ SAL_DLLPRIVATE void _SetMacros(const OUString &rName,
const SvxMacro *pStart,
const SvxMacro *pEnd);
- SW_DLLPRIVATE sal_Bool Expand( const OUString& rShortName,
+ SAL_DLLPRIVATE sal_Bool Expand( const OUString& rShortName,
SwGlossaries* pGlossaries,
SwTextBlocks *pGlossary );
diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx
index 137f2de..e8b8cbb 100644
--- a/sw/source/ui/inc/numfmtlb.hxx
+++ b/sw/source/ui/inc/numfmtlb.hxx
@@ -38,11 +38,11 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
//to be shown in the number format dialog
sal_Bool bUseAutomaticLanguage;//determine whether language is automatically assigned
- SW_DLLPRIVATE DECL_LINK( SelectHdl, ListBox * );
+ SAL_DLLPRIVATE DECL_LINK( SelectHdl, ListBox * );
- SW_DLLPRIVATE double GetDefValue(const short nFormatType) const;
- SW_DLLPRIVATE void Init(short nFormatType, sal_Bool bUsrFmts);
- SW_DLLPRIVATE SwView* GetView();
+ SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const;
+ SAL_DLLPRIVATE void Init(short nFormatType, sal_Bool bUsrFmts);
+ SAL_DLLPRIVATE SwView* GetView();
public:
NumFormatListBox(Window* pWin, WinBits nStyle);
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx
index 707baf9..5e9422c 100644
--- a/sw/source/ui/inc/prcntfld.hxx
+++ b/sw/source/ui/inc/prcntfld.hxx
@@ -40,7 +40,7 @@ class SW_DLLPUBLIC PercentField
bool bLockAutoCalculation; //prevent recalcution of percent values when the
//reference value is changed
- SW_DLLPRIVATE sal_Int64 ImpPower10(sal_uInt16 n);
+ SAL_DLLPRIVATE sal_Int64 ImpPower10(sal_uInt16 n);
public:
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 83ea13c..ef127fc 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -180,23 +180,23 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
sal_Bool mbResetFormDesignMode:1;
sal_Bool mbFormDesignModeToReset:1;
- SW_DLLPRIVATE void Init(const SwViewOption* = 0);
- SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
+ SAL_DLLPRIVATE void Init(const SwViewOption* = 0);
+ SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
- SW_DLLPRIVATE int _CreateScrollbar( sal_Bool bHori );
- SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
- SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
- SW_DLLPRIVATE DECL_LINK( BtnPage, Button * );
- SW_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True );
+ SAL_DLLPRIVATE int _CreateScrollbar( sal_Bool bHori );
+ SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
+ SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
+ SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
+ SAL_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True );
- SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
- SW_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
- SW_DLLPRIVATE virtual bool HasPrintOptionsPage() const;
- SW_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent,
+ SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
+ SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+ SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const;
+ SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent,
const SfxItemSet &rOptions );
- SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
+ SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
/** Helper method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN
@@ -207,7 +207,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
@param _pReq
optional input parameter - pointer to the <SfxRequest> instance, if existing.
*/
- SW_DLLPRIVATE void _ExecPgUpAndPgDown( const bool _bPgUp,
+ SAL_DLLPRIVATE void _ExecPgUpAndPgDown( const bool _bPgUp,
SfxRequest* _pReq = 0 );
protected:
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 4210861..1d460a5 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -94,25 +94,25 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
// prevent update dialog data during longer operations (cf #102657#)
bool bInhibitActivate;
- SW_DLLPRIVATE DECL_LINK( AcceptHdl, void* );
- SW_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* );
- SW_DLLPRIVATE DECL_LINK( RejectHdl, void* );
- SW_DLLPRIVATE DECL_LINK( RejectAllHdl, void* );
- SW_DLLPRIVATE DECL_LINK( UndoHdl, void* );
- SW_DLLPRIVATE DECL_LINK( DeselectHdl, void* );
- SW_DLLPRIVATE DECL_LINK( SelectHdl, void* );
- SW_DLLPRIVATE DECL_LINK( GotoHdl, void* );
- SW_DLLPRIVATE DECL_LINK( CommandHdl, void* );
-
- SW_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, sal_Bool bChild);
- SW_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt);
- SW_DLLPRIVATE void InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX);
- SW_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
- SW_DLLPRIVATE void InitAuthors();
-
- SW_DLLPRIVATE OUString GetRedlineText(const SwRangeRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0);
- SW_DLLPRIVATE OUString GetActionText(const SwRangeRedline& rRedln, sal_uInt16 nStack = 0);
- SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry) const;
+ SAL_DLLPRIVATE DECL_LINK( AcceptHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( RejectHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( RejectAllHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( UndoHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( DeselectHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( SelectHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( GotoHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( CommandHdl, void* );
+
+ SAL_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, sal_Bool bChild);
+ SAL_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt);
+ SAL_DLLPRIVATE void InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX);
+ SAL_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
+ SAL_DLLPRIVATE void InitAuthors();
+
+ SAL_DLLPRIVATE OUString GetRedlineText(const SwRangeRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0);
+ SAL_DLLPRIVATE OUString GetActionText(const SwRangeRedline& rRedln, sal_uInt16 nStack = 0);
+ SAL_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry) const;
public:
SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt = sal_False);
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 3f2cfbf..502e483 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -60,9 +60,9 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox
SwEntryLst aDelEntryLst;
SwBoxEntry aDefault;
- SW_DLLPRIVATE void InitComboBox();
- SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry);
- SW_DLLPRIVATE void Init();
+ SAL_DLLPRIVATE void InitComboBox();
+ SAL_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry);
+ SAL_DLLPRIVATE void Init();
public:
diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx
index b04aeda..4144b9b 100644
--- a/sw/source/ui/inc/tablemgr.hxx
+++ b/sw/source/ui/inc/tablemgr.hxx
@@ -47,7 +47,7 @@ class SW_DLLPUBLIC SwTableFUNC
SwTabCols aCols;
private:
- SW_DLLPRIVATE int GetRightSeparator(int nNum) const;
+ SAL_DLLPRIVATE int GetRightSeparator(int nNum) const;
public:
inline SwTableFUNC(SwFrmFmt &);
diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx
index 14b5105..273ab7c 100644
--- a/sw/source/ui/inc/toxmgr.hxx
+++ b/sw/source/ui/inc/toxmgr.hxx
@@ -265,7 +265,7 @@ class SW_DLLPUBLIC SwTOXMgr
SwTOXMark* pCurTOXMark;
SwTOXMarks aCurMarks;
- SW_DLLPRIVATE sal_uInt16 GetUserTypeID(const OUString& rStr);
+ SAL_DLLPRIVATE sal_uInt16 GetUserTypeID(const OUString& rStr);
public:
// single argument ctors shall be explicit.
diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx
index 39a9427..a474dbd 100644
--- a/sw/source/ui/inc/uinums.hxx
+++ b/sw/source/ui/inc/uinums.hxx
@@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwNumRulesWithName
OUString maName;
// the NumRule's formats _have_ to be independent of a document
// (They should always be there!)
- class SW_DLLPRIVATE _SwNumFmtGlobal
+ class SAL_DLLPRIVATE _SwNumFmtGlobal
{
SwNumFmt aFmt;
OUString sCharFmtName;
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index 49d954f..d5c76cf 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -89,11 +89,11 @@ class SW_DLLPUBLIC SwOneExampleFrame
static bool bShowServiceNotAvailableMessage;
- SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer* );
- SW_DLLPRIVATE DECL_LINK( PopupHdl, Menu* );
+ SAL_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer* );
+ SAL_DLLPRIVATE DECL_LINK( PopupHdl, Menu* );
- SW_DLLPRIVATE void CreateControl();
- SW_DLLPRIVATE void DisposeControl();
+ SAL_DLLPRIVATE void CreateControl();
+ SAL_DLLPRIVATE void DisposeControl();
public:
SwOneExampleFrame(Window& rWin,
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index b3fdbac..d6b6822 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -273,96 +273,96 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
// methods for searching
// set search context
- SW_DLLPRIVATE sal_Bool SearchAndWrap(sal_Bool bApi = sal_False);
- SW_DLLPRIVATE sal_Bool SearchAll(sal_uInt16* pFound = 0);
- SW_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions );
- SW_DLLPRIVATE void Replace();
+ SAL_DLLPRIVATE sal_Bool SearchAndWrap(sal_Bool bApi = sal_False);
+ SAL_DLLPRIVATE sal_Bool SearchAll(sal_uInt16* pFound = 0);
+ SAL_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions );
+ SAL_DLLPRIVATE void Replace();
bool IsDocumentBorder();
- SW_DLLPRIVATE bool IsTextTool() const;
+ SAL_DLLPRIVATE bool IsTextTool() const;
// create control elements
- SW_DLLPRIVATE void CreateBtns();
- SW_DLLPRIVATE DECL_LINK( BtnPage, Button * );
+ SAL_DLLPRIVATE void CreateBtns();
+ SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
- SW_DLLPRIVATE DECL_LINK( TimeoutHdl, void* );
- SW_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* );
+ SAL_DLLPRIVATE DECL_LINK( TimeoutHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* );
- SW_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, void* );
+ SAL_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, void* );
inline long GetXScroll() const;
inline long GetYScroll() const;
- SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
- SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect,
+ SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
+ SAL_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect,
sal_uInt16 nRangeX = USHRT_MAX,
sal_uInt16 nRangeY = USHRT_MAX);
- SW_DLLPRIVATE sal_Bool GetPageScrollUpOffset(SwTwips& rOff) const;
- SW_DLLPRIVATE sal_Bool GetPageScrollDownOffset(SwTwips& rOff) const;
+ SAL_DLLPRIVATE sal_Bool GetPageScrollUpOffset(SwTwips& rOff) const;
+ SAL_DLLPRIVATE sal_Bool GetPageScrollDownOffset(SwTwips& rOff) const;
// scrollbar movements
- SW_DLLPRIVATE long PageUp();
- SW_DLLPRIVATE long PageDown();
- SW_DLLPRIVATE long PageUpCrsr(sal_Bool bSelect);
- SW_DLLPRIVATE long PageDownCrsr(sal_Bool bSelect);
- SW_DLLPRIVATE long PhyPageUp();
- SW_DLLPRIVATE long PhyPageDown();
-
- SW_DLLPRIVATE int _CreateScrollbar( sal_Bool bHori );
- SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
- SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
- SW_DLLPRIVATE sal_Bool UpdateScrollbars();
- SW_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
- SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz );
-
- SW_DLLPRIVATE void CreatePageButtons(sal_Bool bShow);
+ SAL_DLLPRIVATE long PageUp();
+ SAL_DLLPRIVATE long PageDown();
+ SAL_DLLPRIVATE long PageUpCrsr(sal_Bool bSelect);
+ SAL_DLLPRIVATE long PageDownCrsr(sal_Bool bSelect);
+ SAL_DLLPRIVATE long PhyPageUp();
+ SAL_DLLPRIVATE long PhyPageDown();
+
+ SAL_DLLPRIVATE int _CreateScrollbar( sal_Bool bHori );
+ SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
+ SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
+ SAL_DLLPRIVATE sal_Bool UpdateScrollbars();
+ SAL_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
+ SAL_DLLPRIVATE void CalcVisArea( const Size &rPixelSz );
+
+ SAL_DLLPRIVATE void CreatePageButtons(sal_Bool bShow);
// linguistics functions
- SW_DLLPRIVATE void HyphenateDocument();
- SW_DLLPRIVATE sal_Bool IsDrawTextHyphenate();
- SW_DLLPRIVATE void HyphenateDrawText();
- SW_DLLPRIVATE void StartThesaurus();
+ SAL_DLLPRIVATE void HyphenateDocument();
+ SAL_DLLPRIVATE sal_Bool IsDrawTextHyphenate();
+ SAL_DLLPRIVATE void HyphenateDrawText();
+ SAL_DLLPRIVATE void StartThesaurus();
// text conversion
- SW_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive );
+ SAL_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive );
// used for spell checking and text conversion
- SW_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, bool bStartDone,
+ SAL_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, bool bStartDone,
bool bEndDone, SwConversionArgs *pConvArgs = 0 );
- SW_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 );
+ SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 );
- SW_DLLPRIVATE void HyphStart( SvxSpellArea eSpell );
- SW_DLLPRIVATE sal_Bool CheckSpecialCntnt();
- SW_DLLPRIVATE void SpellKontext(sal_Bool bOn = sal_True)
+ SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell );
+ SAL_DLLPRIVATE sal_Bool CheckSpecialCntnt();
+ SAL_DLLPRIVATE void SpellKontext(sal_Bool bOn = sal_True)
{ m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; }
// methods for printing
- SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
- SW_DLLPRIVATE virtual bool HasPrintOptionsPage() const;
- SW_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent,
+ SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
+ SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const;
+ SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent,
const SfxItemSet& rSet);
// for readonly switching
- SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- SW_DLLPRIVATE void _CheckReadonlyState();
- SW_DLLPRIVATE void _CheckReadonlySelection();
+ SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ SAL_DLLPRIVATE void _CheckReadonlyState();
+ SAL_DLLPRIVATE void _CheckReadonlySelection();
// method for rotating PageDesc
- SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR);
+ SAL_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR);
- SW_DLLPRIVATE void _SetZoom( const Size &rEditSz,
+ SAL_DLLPRIVATE void _SetZoom( const Size &rEditSz,
SvxZoomType eZoomType,
short nFactor = 100,
sal_Bool bViewOnly = sal_False);
- SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
+ SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
- SW_DLLPRIVATE void ShowAtResize();
+ SAL_DLLPRIVATE void ShowAtResize();
- SW_DLLPRIVATE virtual void Move();
+ SAL_DLLPRIVATE virtual void Move();
- SW_DLLPRIVATE sal_Bool InsertGraphicDlg( SfxRequest& );
+ SAL_DLLPRIVATE sal_Bool InsertGraphicDlg( SfxRequest& );
- SW_DLLPRIVATE void DocumentStatsChanged();
+ SAL_DLLPRIVATE void DocumentStatsChanged();
protected:
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 2b6dfd7..2b1c922 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -475,8 +475,8 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
private:
- SW_DLLPRIVATE void OpenMark();
- SW_DLLPRIVATE void CloseMark( bool bOkFlag );
+ SAL_DLLPRIVATE void OpenMark();
+ SAL_DLLPRIVATE void CloseMark( bool bOkFlag );
struct ModeStack
{
@@ -530,21 +530,21 @@ private:
Point aDest;
bool bDestOnStack;
bool HasCrsrStack() const { return 0 != pCrsrStack; }
- SW_DLLPRIVATE sal_Bool PushCrsr(SwTwips lOffset, sal_Bool bSelect);
- SW_DLLPRIVATE sal_Bool PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False);
+ SAL_DLLPRIVATE sal_Bool PushCrsr(SwTwips lOffset, sal_Bool bSelect);
+ SAL_DLLPRIVATE sal_Bool PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False);
// take END cursor along when PageUp / -Down
- SW_DLLPRIVATE bool _SttWrd();
- SW_DLLPRIVATE bool _EndWrd();
- SW_DLLPRIVATE sal_Bool _NxtWrd();
- SW_DLLPRIVATE sal_Bool _PrvWrd();
+ SAL_DLLPRIVATE bool _SttWrd();
+ SAL_DLLPRIVATE bool _EndWrd();
+ SAL_DLLPRIVATE sal_Bool _NxtWrd();
+ SAL_DLLPRIVATE sal_Bool _PrvWrd();
// #i92468#
- SW_DLLPRIVATE sal_Bool _NxtWrdForDelete();
- SW_DLLPRIVATE sal_Bool _PrvWrdForDelete();
- SW_DLLPRIVATE sal_Bool _FwdSentence();
- SW_DLLPRIVATE sal_Bool _BwdSentence();
+ SAL_DLLPRIVATE sal_Bool _NxtWrdForDelete();
+ SAL_DLLPRIVATE sal_Bool _PrvWrdForDelete();
+ SAL_DLLPRIVATE sal_Bool _FwdSentence();
+ SAL_DLLPRIVATE sal_Bool _BwdSentence();
sal_Bool _FwdPara();
- SW_DLLPRIVATE sal_Bool _BwdPara();
+ SAL_DLLPRIVATE sal_Bool _BwdPara();
// selections
sal_Bool bIns :1;
@@ -564,40 +564,40 @@ private:
Link aSelTblLink;
// resets the cursor stack after movement by PageUp/-Down
- SW_DLLPRIVATE void _ResetCursorStack();
+ SAL_DLLPRIVATE void _ResetCursorStack();
- SW_DLLPRIVATE void SttDragDrop(Timer *);
+ SAL_DLLPRIVATE void SttDragDrop(Timer *);
using SwCrsrShell::SetCrsr;
- SW_DLLPRIVATE long SetCrsr(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long SetCrsr(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long SetCrsrKillSel(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long SetCrsrKillSel(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long StdSelect(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long BeginDrag(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long Drag(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long EndDrag(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long StdSelect(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long BeginDrag(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long Drag(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long EndDrag(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long ExtSelWrd(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long ExtSelLn(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long ExtSelWrd(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long ExtSelLn(const Point *, sal_Bool bProp=sal_False );
// move text from Drag and Drop; Point is destination for all selections.
- SW_DLLPRIVATE long MoveText(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long MoveText(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long BeginFrmDrag(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long BeginFrmDrag(const Point *, sal_Bool bProp=sal_False );
// after SSize/Move of a frame update; Point is destination.
- SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long UpdateLayoutFrm(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long SttLeaveSelect(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long AddLeaveSelect(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE long Ignore(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long SttLeaveSelect(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long AddLeaveSelect(const Point *, sal_Bool bProp=sal_False );
+ SAL_DLLPRIVATE long Ignore(const Point *, sal_Bool bProp=sal_False );
- SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = sal_False;}
+ SAL_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = sal_False;}
- SW_DLLPRIVATE sal_Bool GoStart(sal_Bool KeepArea = sal_False, sal_Bool * = 0,
+ SAL_DLLPRIVATE sal_Bool GoStart(sal_Bool KeepArea = sal_False, sal_Bool * = 0,
sal_Bool bSelect = sal_False, sal_Bool bDontMoveRegion = sal_False);
- SW_DLLPRIVATE sal_Bool GoEnd(sal_Bool KeepArea = sal_False, sal_Bool * = 0);
+ SAL_DLLPRIVATE sal_Bool GoEnd(sal_Bool KeepArea = sal_False, sal_Bool * = 0);
enum BookMarkMove
{
@@ -607,7 +607,7 @@ private:
BOOKMARK_LAST_LAST_ENTRY
};
- SW_DLLPRIVATE sal_Bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL);
+ SAL_DLLPRIVATE sal_Bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL);
};
inline void SwWrtShell::ResetCursorStack()
commit 06f45db7eee542a0dc869db1ac26c1ea6f77570f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:43:21 2014 +0100
Remove needless SW_DLLPRIVATE annotations
Change-Id: Iae7d6ca73d64b1fa95cdd3f84e6ad51fb0015e4d
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 3800258..a47e456 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -40,7 +40,7 @@ typedef enum {
} CopyOrNew_t;
/// if COPY then pTxtNode must be given!
-SW_DLLPRIVATE SwTxtAttr * MakeTxtAttr(
+SwTxtAttr * MakeTxtAttr(
SwDoc & rDoc,
SfxPoolItem & rNew,
sal_Int32 const nStt,
@@ -48,14 +48,14 @@ SW_DLLPRIVATE SwTxtAttr * MakeTxtAttr(
CopyOrNew_t const bIsCopy = NEW,
SwTxtNode *const pTxtNode = 0 );
-SW_DLLPRIVATE SwTxtAttr * MakeTxtAttr(
+SwTxtAttr * MakeTxtAttr(
SwDoc & rDoc,
const SfxItemSet & rSet,
sal_Int32 nStt,
sal_Int32 nEnd );
/// create redline dummy text hint that must not be inserted into hints array
-SW_DLLPRIVATE SwTxtAttr* MakeRedlineTxtAttr(
+SwTxtAttr* MakeRedlineTxtAttr(
SwDoc & rDoc,
SfxPoolItem& rAttr );
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 44d99e3..bb37fc7 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -45,7 +45,7 @@ public:
};
namespace sw {
-class SW_DLLPRIVATE UndoRedoContext
+class UndoRedoContext
: public SfxUndoContext
{
public:
@@ -78,7 +78,7 @@ private:
SdrMarkList * m_pMarkList;
};
-class SW_DLLPRIVATE RepeatContext
+class RepeatContext
: public SfxRepeatTarget
{
public:
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index b9a3b99..56d72c6 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -83,7 +83,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert)
};
-SwRewriter SW_DLLPRIVATE
+SwRewriter
MakeUndoReplaceRewriter(sal_uLong const ocurrences,
OUString const& sOld, OUString const& sNew);
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index 00de819..ea68152 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -61,9 +61,9 @@ public:
void SetUpdtFtnFlag(bool const bFlag) { m_bUpdateFtn = bFlag; }
};
-SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&);
+SwUndo * MakeUndoDelSection(SwSectionFmt const&);
-SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
+SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 86c488a..4af1dcc 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -296,7 +296,7 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
};
-SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const& rFormat)
+SwUndo * MakeUndoDelSection(SwSectionFmt const& rFormat)
{
return new SwUndoDelSection(rFormat, *rFormat.GetSection(),
rFormat.GetCntnt().GetCntntIdx());
@@ -409,7 +409,7 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
};
-SW_DLLPRIVATE SwUndo *
+SwUndo *
MakeUndoUpdateSection(SwSectionFmt const& rFormat, bool const bOnlyAttr)
{
return new SwUndoUpdateSection(*rFormat.GetSection(),
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index fbd2e8e..3bebd69 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -46,7 +46,7 @@ class SwWordCountFloatDlg : public SfxModelessDialog
CloseButton* m_pClosePB;
- SW_DLLPRIVATE DECL_LINK( CloseHdl, void* );
+ DECL_LINK( CloseHdl, void* );
public:
SwWordCountFloatDlg( SfxBindings* pBindings,
SfxChildWindow* pChild,
commit 38a5b7e9788bf53e8b943e74486b74780c01d39b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:29:48 2014 +0100
Unused SWD_DLLPRIVATE
Change-Id: I9eeb6973a8056002f0cb478138056c30189a46e7
diff --git a/sw/inc/swddllapi.h b/sw/inc/swddllapi.h
index d2b9f0d..d0d70c9 100644
--- a/sw/inc/swddllapi.h
+++ b/sw/inc/swddllapi.h
@@ -27,7 +27,6 @@
#else
#define SWD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#define SWD_DLLPRIVATE SAL_DLLPRIVATE
#endif // INCLUDED_SW_INC_SWDDLLAPI_H
commit d7c274cad964509a7ae9eb4646cc95f7257b6c00
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:27:14 2014 +0100
Remove needless SAL_DLLPRIVATE annotations
Change-Id: Icfb27f12627796a05854dfb436b8d4e66c38d5db
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index e2036e7..bbf13b8 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -88,7 +88,7 @@ typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::X
//==============================================================================
// a class iterating through all fields of a form which are bound to a field
// sub forms are ignored, grid columns (where the grid is a direct child of the form) are included
-class SAL_DLLPRIVATE FmXBoundFormFieldIterator : public ::comphelper::IndexAccessIterator
+class FmXBoundFormFieldIterator : public ::comphelper::IndexAccessIterator
{
public:
FmXBoundFormFieldIterator(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rStartingPoint) : ::comphelper::IndexAccessIterator(_rStartingPoint) { }
@@ -100,7 +100,7 @@ protected:
class FmFormPage;
//========================================================================
-struct SAL_DLLPRIVATE FmLoadAction
+struct FmLoadAction
{
FmFormPage* pPage;
sal_uLong nEventId;
@@ -122,7 +122,7 @@ typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::beans::XPropertyCh
> FmXFormShell_BD_BASE;
//========================================================================
-class SAL_DLLPRIVATE FmXFormShell_Base_Disambiguation : public FmXFormShell_BD_BASE
+class FmXFormShell_Base_Disambiguation : public FmXFormShell_BD_BASE
{
using ::com::sun::star::beans::XPropertyChangeListener::disposing;
protected:
@@ -144,7 +144,7 @@ struct SdrViewEvent;
class FmFormShell;
class FmFormView;
class FmFormObj;
-class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE
+class FmXFormShell :public FmXFormShell_BASE
,public FmXFormShell_CFGBASE
,public ::svxform::OStaticDataAccessTools
,public ::svx::IControllerFeatureInvalidation
@@ -554,7 +554,7 @@ inline sal_Bool FmXFormShell::IsSelectionUpdatePending()
// = der Teil mit dem Container-Test fuer dieses Objekt.
// =
-class SAL_DLLPRIVATE SearchableControlIterator : public ::comphelper::IndexAccessIterator
+class SearchableControlIterator : public ::comphelper::IndexAccessIterator
{
OUString m_sCurrentValue;
// der aktuelle Wert der ControlSource-::com::sun::star::beans::Property
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 62e178d..1cc77a9 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -130,7 +130,7 @@ namespace svxform
// FormController
//==================================================================
class ColumnInfoCache;
- class SAL_DLLPRIVATE FormController :public ::comphelper::OBaseMutex
+ class FormController :public ::comphelper::OBaseMutex
,public FormController_BASE
,public ::cppu::OPropertySetHelper
,public DispatchInterceptor
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 1b7d5e5..6277bd8 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -32,7 +32,7 @@
//==================================================================
class FmFieldWin;
-class SAL_DLLPRIVATE FmFieldWinListBox
+class FmFieldWinListBox
:public SvTreeListBox
{
FmFieldWin* pTabWin;
@@ -59,7 +59,7 @@ protected:
//========================================================================
class FmFormShell;
-class SAL_DLLPRIVATE FmFieldWinData
+class FmFieldWinData
{
public:
FmFieldWinData();
@@ -67,7 +67,7 @@ public:
};
//========================================================================
-class SAL_DLLPRIVATE FmFieldWin :public SfxFloatingWindow
+class FmFieldWin :public SfxFloatingWindow
,public SfxControllerItem
,public ::comphelper::OPropertyChangeListener
,public ::svxform::OStaticDataAccessTools
@@ -120,7 +120,7 @@ protected:
};
//========================================================================
-class SAL_DLLPRIVATE FmFieldWinMgr : public SfxChildWindow
+class FmFieldWinMgr : public SfxChildWindow
{
public:
FmFieldWinMgr(Window *pParent, sal_uInt16 nId,
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 3385e3a..4a683c7 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -106,7 +106,7 @@ void SdrControlEventListenerImpl::StartListening(const uno::Reference< lang::XCo
}
// =============================================================================
-struct SAL_DLLPRIVATE SdrUnoObjDataHolder
+struct SdrUnoObjDataHolder
{
mutable ::rtl::Reference< SdrControlEventListenerImpl >
pEventListener;
commit 2ea954d4f85df450ef687f42d2fa7a6e4c21fb1c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:23:18 2014 +0100
Remove needless SAL_DLLPRIVATE annotations
Change-Id: I5794e7ca922941e2d17a89cbaebfb2c6722519f8
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 933fe5d..8c6d40d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4185,7 +4185,7 @@ namespace sfx { namespace intern {
/** a class which, in its dtor, cleans up variuos objects (well, at the moment only the frame) collected during
the creation of a document view, unless the creation was successful.
*/
- class SAL_DLLPRIVATE ViewCreationGuard
+ class ViewCreationGuard
{
public:
ViewCreationGuard()
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 4cad3d25..5537e2b 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -412,7 +412,7 @@ OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFra
//--------------------------------------------------------------------
-SAL_DLLPRIVATE void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient )
+void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient )
{
SfxInPlaceClientList* pClientList = GetIPClientList_Impl(sal_True);
commit 20396cc8dc9f9decf6d3a0ed703930a90c2a9ee1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:21:40 2014 +0100
Remove redundant SAL_DLLPRIVATE
Change-Id: I3ec6054f07ef171ee1d4f6d7c5bf92c19ff25e9b
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 8d00e1b..1c1ffb0 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -73,7 +73,7 @@ public:
};
-sal_Bool SAL_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False;
+sal_Bool SdPageObjsTLB::bIsInDrag = sal_False;
sal_Bool SdPageObjsTLB::IsInDrag()
{
commit 47811d4cf17688b2db5910e2cd500143137fd6f1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 14:14:26 2014 +0100
Remove SC_DLLPRIVATE -> SAL_DLLPRIVATE indirection
Change-Id: I1360a96ebe33bd6d70ac7728844c4ba1137e51ab
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 9c12752..6b5e322 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -269,8 +269,8 @@ private:
ScAutoFormatDataField** ppDataField;
- SC_DLLPRIVATE ScAutoFormatDataField& GetField( sal_uInt16 nIndex );
- SC_DLLPRIVATE const ScAutoFormatDataField& GetField( sal_uInt16 nIndex ) const;
+ SAL_DLLPRIVATE ScAutoFormatDataField& GetField( sal_uInt16 nIndex );
+ SAL_DLLPRIVATE const ScAutoFormatDataField& GetField( sal_uInt16 nIndex ) const;
public:
ScAutoFormatData();
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 05a063d..39cdd7b 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -104,11 +104,11 @@ private:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list