summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-04-16 10:01:37 +0200
committerDavid Tardon <dtardon@redhat.com>2015-04-16 10:02:17 +0200
commit565716b0abca281dfc1291aedf4497f55611b6b1 (patch)
tree7aa0296c20fcc596216f47415621bfa257d08971 /sd
parentcfaccff5aa7be7e240e51c6661ee09812b1aa113 (diff)
Revert "make more classes dllpublic"
This reverts commit add2ca7b3ab10ed9d18e60d8e50020168d922836. It causes too much breakage on windows. It is better to start again from scratch.
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/CustomAnimationEffect.hxx2
-rw-r--r--sd/inc/sdmod.hxx6
-rw-r--r--sd/inc/stlpool.hxx4
-rw-r--r--sd/source/ui/inc/View.hxx2
-rw-r--r--sd/source/ui/inc/ViewShell.hxx6
5 files changed, 10 insertions, 10 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 8e4b62836db0..e415989c979f 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -379,7 +379,7 @@ private:
typedef boost::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
typedef std::list< InteractiveSequencePtr > InteractiveSequenceList;
-class SD_DLLPUBLIC MainSequence : public EffectSequenceHelper, public ISequenceListener
+class MainSequence : public EffectSequenceHelper, public ISequenceListener
{
friend class UndoAnimation;
friend class MainSequenceRebuildGuard;
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index a080caa0381c..5ad63fd081ee 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -75,7 +75,7 @@ typedef std::map< sal_uInt32, css::uno::Sequence< css::uno::Type> > SdTypesCache
*/
-class SD_DLLPUBLIC SdModule : public SfxModule, public SfxListener
+class SdModule : public SfxModule, public SfxListener
{
public:
TYPEINFO_OVERRIDE();
@@ -98,7 +98,7 @@ public:
void GetState(SfxItemSet&);
SdOptions* GetSdOptions(DocumentType eDocType);
- SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
+ SD_DLLPUBLIC 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);
- SvNumberFormatter* GetNumberFormatter();
+ SD_DLLPUBLIC 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 4138c977522a..5a22993fd36f 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -52,7 +52,7 @@ typedef ::cppu::ImplInheritanceHelper4< SfxStyleSheetPool,
::com::sun::star::container::XNameAccess,
::com::sun::star::lang::XComponent > SdStyleSheetPoolBase;
-class SD_DLLPUBLIC SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
+class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
{
friend class SdDrawDocument;
public:
@@ -74,7 +74,7 @@ public:
had to be created. This is used to assert errors in documents
when styles are missing.
*/
- void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false );
+ SD_DLLPUBLIC 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/View.hxx b/sd/source/ui/inc/View.hxx
index 264a65c38252..1b22016d93e2 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -82,7 +82,7 @@ public:
void End();
};
-class SD_DLLPUBLIC View : public FmFormView
+class View : public FmFormView
{
public:
TYPEINFO_OVERRIDE();
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index fc96c1a92fd1..1b46129e1087 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -79,7 +79,7 @@ class ZoomList;
<p>This class replaces the former ViewShell class.</p>
*/
-class SD_DLLPUBLIC ViewShell
+class ViewShell
: public SfxShell
{
public:
@@ -149,11 +149,11 @@ public:
inline ::sd::View* GetView() const { return mpView; }
inline SdrView* GetDrawView() const;
- DrawDocShell* GetDocSh() const;
+ SD_DLLPUBLIC DrawDocShell* GetDocSh() const;
SdDrawDocument* GetDoc() const;
- SfxViewFrame* GetViewFrame() const;
+ SD_DLLPUBLIC SfxViewFrame* GetViewFrame() const;
/** The active window is usually the mpContentWindow. When there is a
show running then the active window is a ShowWindow.