diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-13 15:47:22 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-13 15:47:57 +0100 |
| commit | b21910c9caf4cc81fabe754f397778cd9da01d10 (patch) | |
| tree | 1cd4a7126ee07fac24c0696ed24980922e9294ee /oox | |
| parent | d747d0fc3b3e9c02a2eaa5b4a03c6905a68663d0 (diff) | |
Fix win build
Use namespace to avoid ambiguity.
Change-Id: Iaef6869b12839edbb94695aa5e3d877863e9b669
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/drawingmltypes.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index 70216f979ef9..1c5de59bbba3 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -252,7 +252,7 @@ TabAlign GetTabAlign( sal_Int32 aToken ) return nEnum; } -const char* GetHatchPattern( const Hatch& rHatch ) +const char* GetHatchPattern( const drawing::Hatch& rHatch ) { const char* sPattern = 0; const sal_Int32 nAngle = rHatch.Angle > 1800 ? rHatch.Angle - 1800 : rHatch.Angle; @@ -261,7 +261,7 @@ const char* GetHatchPattern( const Hatch& rHatch ) { switch( rHatch.Style ) { - case HatchStyle_SINGLE: + case drawing::HatchStyle_SINGLE: { if( rHatch.Distance < 75 ) sPattern = "ltHorz"; @@ -270,8 +270,8 @@ const char* GetHatchPattern( const Hatch& rHatch ) break; } - case HatchStyle_DOUBLE: - case HatchStyle_TRIPLE: + case drawing::HatchStyle_DOUBLE: + case drawing::HatchStyle_TRIPLE: { if( rHatch.Distance < 75 ) sPattern = "smGrid"; @@ -288,7 +288,7 @@ const char* GetHatchPattern( const Hatch& rHatch ) { switch( rHatch.Style ) { - case HatchStyle_SINGLE: + case drawing::HatchStyle_SINGLE: { if( rHatch.Distance < 75 ) sPattern = "ltUpDiag"; @@ -297,8 +297,8 @@ const char* GetHatchPattern( const Hatch& rHatch ) break; } - case HatchStyle_DOUBLE: - case HatchStyle_TRIPLE: + case drawing::HatchStyle_DOUBLE: + case drawing::HatchStyle_TRIPLE: { if( rHatch.Distance < 75 ) sPattern = "smCheck"; @@ -315,7 +315,7 @@ const char* GetHatchPattern( const Hatch& rHatch ) { switch( rHatch.Style ) { - case HatchStyle_SINGLE: + case drawing::HatchStyle_SINGLE: { if( rHatch.Distance < 75 ) sPattern = "ltVert"; @@ -324,8 +324,8 @@ const char* GetHatchPattern( const Hatch& rHatch ) break; } - case HatchStyle_DOUBLE: - case HatchStyle_TRIPLE: + case drawing::HatchStyle_DOUBLE: + case drawing::HatchStyle_TRIPLE: { if( rHatch.Distance < 75 ) sPattern = "smGrid"; @@ -342,7 +342,7 @@ const char* GetHatchPattern( const Hatch& rHatch ) { switch( rHatch.Style ) { - case HatchStyle_SINGLE: + case drawing::HatchStyle_SINGLE: { if( rHatch.Distance < 75 ) sPattern = "ltDnDiag"; @@ -351,8 +351,8 @@ const char* GetHatchPattern( const Hatch& rHatch ) break; } - case HatchStyle_DOUBLE: - case HatchStyle_TRIPLE: + case drawing::HatchStyle_DOUBLE: + case drawing::HatchStyle_TRIPLE: { if( rHatch.Distance < 75 ) sPattern = "smCheck"; |