sd/inc/sdmod.hxx | 4 ++-- sd/inc/stlpool.hxx | 2 +- sd/source/ui/inc/ViewShell.hxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit a21118b0492c6424b4cccaf588ab73cbf9423a18 Author: David Tardon <[email protected]> Date: Thu Apr 16 09:23:12 2015 +0200 fix windows build error C2487: member of dll interface class may not be declared with dll interface Change-Id: I63898789eb9c9ee767a5c72e31156e23d50c81fb diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index e79ccde..a080caa 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -98,7 +98,7 @@ public: void GetState(SfxItemSet&); SdOptions* GetSdOptions(DocumentType eDocType); - SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode ); + SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode ); bool GetWaterCan() const { return bWaterCan; } void SetWaterCan( bool bWC ) { bWaterCan = bWC; } @@ -120,7 +120,7 @@ public: */ OutputDevice* GetRefDevice (::sd::DrawDocShell& rDocShell); - SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); + SvNumberFormatter* GetNumberFormatter(); // virtual methods for the option dialog virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 2303c7f..4138c97 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -74,7 +74,7 @@ public: had to be created. This is used to assert errors in documents when styles are missing. */ - SD_DLLPUBLIC void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false ); + void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false ); void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const; void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets); void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets ); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index dd5e1ea..fc96c1a 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -149,11 +149,11 @@ public: inline ::sd::View* GetView() const { return mpView; } inline SdrView* GetDrawView() const; - SD_DLLPUBLIC DrawDocShell* GetDocSh() const; + DrawDocShell* GetDocSh() const; SdDrawDocument* GetDoc() const; - SD_DLLPUBLIC SfxViewFrame* GetViewFrame() const; + SfxViewFrame* GetViewFrame() const; /** The active window is usually the mpContentWindow. When there is a show running then the active window is a ShowWindow. _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
