diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-07-12 18:12:34 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-12 20:57:58 +0200 |
| commit | 2cca46d54846b0cd7769b9287f17632a4258256d (patch) | |
| tree | d0a6fa638d4e4afdbb93ee83c9afd46723f467e1 /sfx2/source | |
| parent | 5e28f6e9d3021171b12a7827cd5c93cfda1fcd90 (diff) | |
PCH for more libraries
Change-Id: I6f9a1969605e0016b11157ddb5754ac77fd3966b
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/syspathw32.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index e2b1618083bb..c720328f98ce 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -35,6 +34,9 @@ #include <unotools/moduleoptions.hxx> #include <unotools/dynamicmenuoptions.hxx> +#undef WB_LEFT +#undef WB_RIGHT + #include "shutdownicon.hxx" #include "app.hrc" #include <shlobj.h> diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 872299c5b242..b80086bf02ae 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -836,8 +836,8 @@ void ThumbnailView::Paint( const Rectangle &aRect) size_t nItemCount = mItemList.size(); // Draw background - Primitive2DSequence aSeq(1); - aSeq[0] = Primitive2DReference( new PolyPolygonColorPrimitive2D( + drawinglayer::primitive2d::Primitive2DSequence aSeq(1); + aSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonColorPrimitive2D( B2DPolyPolygon(Polygon(aRect,5,5).getB2DPolygon()), maColor.getBColor())); diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx index c5c40b0b756a..e673749c2161 100644 --- a/sfx2/source/doc/syspathw32.cxx +++ b/sfx2/source/doc/syspathw32.cxx @@ -23,6 +23,10 @@ #ifdef _MSC_VER #pragma warning(disable:4917) #endif + +#undef WB_LEFT +#undef WB_RIGHT + #include <shlobj.h> static bool _SHGetSpecialFolderW32( int nFolderID, WCHAR* pszFolder, int nSize ) diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index a6140b7363ac..34c4b1884a6e 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -926,7 +926,7 @@ void SfxToolBoxControl::StateChanged sal_uInt16 nItemBits = pImpl->pBox->GetItemBits( GetId() ); nItemBits &= ~TIB_CHECKABLE; - TriState eTri = STATE_NOCHECK; + ::TriState eTri = STATE_NOCHECK; switch ( eState ) { case SFX_ITEM_AVAILABLE: |