diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-03 14:14:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-03 16:05:11 +0100 |
| commit | 47811d4cf17688b2db5910e2cd500143137fd6f1 (patch) | |
| tree | dc9d86a2138a697c410eed9292d27f45a1d85e7e /sc/source/ui/inc/docsh.hxx | |
| parent | 859e8bea5e2552e65f288387c82c949a883ff64e (diff) | |
Remove SC_DLLPRIVATE -> SAL_DLLPRIVATE indirection
Change-Id: I1360a96ebe33bd6d70ac7728844c4ba1137e51ab
Diffstat (limited to 'sc/source/ui/inc/docsh.hxx')
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 5072f56d633f..28fe4c737d0b 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -119,10 +119,10 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScCollaboration* mpCollaboration; #endif - SC_DLLPRIVATE void InitItems(); - SC_DLLPRIVATE void DoEnterHandler(); - SC_DLLPRIVATE void InitOptions(bool bForLoading); - SC_DLLPRIVATE void ResetDrawObjectShell(); + SAL_DLLPRIVATE void InitItems(); + SAL_DLLPRIVATE void DoEnterHandler(); + SAL_DLLPRIVATE void InitOptions(bool bForLoading); + SAL_DLLPRIVATE void ResetDrawObjectShell(); // SUNWS needs a forward declared friend, otherwise types and members // of the outer class are not accessible. @@ -139,32 +139,32 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScDocShell & mrDocShell; }; - SC_DLLPRIVATE sal_Bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); - SC_DLLPRIVATE sal_Bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); - SC_DLLPRIVATE SCTAB GetSaveTab(); + SAL_DLLPRIVATE sal_Bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); + SAL_DLLPRIVATE sal_Bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); + SAL_DLLPRIVATE SCTAB GetSaveTab(); - SC_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium ); + SAL_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium ); - SC_DLLPRIVATE sal_uLong DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, + SAL_DLLPRIVATE sal_uLong DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ); - SC_DLLPRIVATE sal_uLong DBaseExport( + SAL_DLLPRIVATE sal_uLong DBaseExport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo ); - SC_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); - SC_DLLPRIVATE static bool KillFile( const INetURLObject& rURL ); - SC_DLLPRIVATE static bool IsDocument( const INetURLObject& rURL ); + SAL_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); + SAL_DLLPRIVATE static bool KillFile( const INetURLObject& rURL ); + SAL_DLLPRIVATE static bool IsDocument( const INetURLObject& rURL ); - SC_DLLPRIVATE void LockPaint_Impl(sal_Bool bDoc); - SC_DLLPRIVATE void UnlockPaint_Impl(sal_Bool bDoc); - SC_DLLPRIVATE void LockDocument_Impl(sal_uInt16 nNew); - SC_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew); + SAL_DLLPRIVATE void LockPaint_Impl(sal_Bool bDoc); + SAL_DLLPRIVATE void UnlockPaint_Impl(sal_Bool bDoc); + SAL_DLLPRIVATE void LockDocument_Impl(sal_uInt16 nNew); + SAL_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew); - SC_DLLPRIVATE void EnableSharedSettings( bool bEnable ); - SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument(); + SAL_DLLPRIVATE void EnableSharedSettings( bool bEnable ); + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument(); - SC_DLLPRIVATE void UseSheetSaveEntries(); + SAL_DLLPRIVATE void UseSheetSaveEntries(); - SC_DLLPRIVATE ScDocFunc *CreateDocFunc(); + SAL_DLLPRIVATE ScDocFunc *CreateDocFunc(); protected: @@ -185,7 +185,7 @@ public: using SfxShell::Deactivate; // with sal_Bool bMDI #if ENABLE_TELEPATHY - SC_DLLPRIVATE ScCollaboration* GetCollaboration(); + SAL_DLLPRIVATE ScCollaboration* GetCollaboration(); #endif virtual void Activate(); virtual void Deactivate(); |