mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix win build

Browse Source 
Use namespace to avoid ambiguity.

Change-Id: Iaef6869b12839edbb94695aa5e3d877863e9b669
This commit is contained in:
Zolnai Tamás
2014-02-13 15:47:22 +01:00
parent d747d0fc3b
commit b21910c9ca
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
oox/source/drawingml/drawingmltypes.cxx
View File

@@ -252,7 +252,7 @@ TabAlign GetTabAlign( sal_Int32 aToken )
return nEnum; return nEnum;
} }
const char* GetHatchPattern( const Hatch& rHatch ) const char* GetHatchPattern( const drawing::Hatch& rHatch )
{ {
const char* sPattern = 0; const char* sPattern = 0;
const sal_Int32 nAngle = rHatch.Angle > 1800 ? rHatch.Angle - 1800 : rHatch.Angle; 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 ) switch( rHatch.Style )
{ {
case HatchStyle_SINGLE: case drawing::HatchStyle_SINGLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "ltHorz"; sPattern = "ltHorz";
@@ -270,8 +270,8 @@ const char* GetHatchPattern( const Hatch& rHatch )
break; break;
} }
case HatchStyle_DOUBLE: case drawing::HatchStyle_DOUBLE:
case HatchStyle_TRIPLE: case drawing::HatchStyle_TRIPLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "smGrid"; sPattern = "smGrid";
@@ -288,7 +288,7 @@ const char* GetHatchPattern( const Hatch& rHatch )
{ {
switch( rHatch.Style ) switch( rHatch.Style )
{ {
case HatchStyle_SINGLE: case drawing::HatchStyle_SINGLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "ltUpDiag"; sPattern = "ltUpDiag";
@@ -297,8 +297,8 @@ const char* GetHatchPattern( const Hatch& rHatch )
break; break;
} }
case HatchStyle_DOUBLE: case drawing::HatchStyle_DOUBLE:
case HatchStyle_TRIPLE: case drawing::HatchStyle_TRIPLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "smCheck"; sPattern = "smCheck";
@@ -315,7 +315,7 @@ const char* GetHatchPattern( const Hatch& rHatch )
{ {
switch( rHatch.Style ) switch( rHatch.Style )
{ {
case HatchStyle_SINGLE: case drawing::HatchStyle_SINGLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "ltVert"; sPattern = "ltVert";
@@ -324,8 +324,8 @@ const char* GetHatchPattern( const Hatch& rHatch )
break; break;
} }
case HatchStyle_DOUBLE: case drawing::HatchStyle_DOUBLE:
case HatchStyle_TRIPLE: case drawing::HatchStyle_TRIPLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "smGrid"; sPattern = "smGrid";
@@ -342,7 +342,7 @@ const char* GetHatchPattern( const Hatch& rHatch )
{ {
switch( rHatch.Style ) switch( rHatch.Style )
{ {
case HatchStyle_SINGLE: case drawing::HatchStyle_SINGLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "ltDnDiag"; sPattern = "ltDnDiag";
@@ -351,8 +351,8 @@ const char* GetHatchPattern( const Hatch& rHatch )
break; break;
} }
case HatchStyle_DOUBLE: case drawing::HatchStyle_DOUBLE:
case HatchStyle_TRIPLE: case drawing::HatchStyle_TRIPLE:
{ {
if( rHatch.Distance < 75 ) if( rHatch.Distance < 75 )
sPattern = "smCheck"; sPattern = "smCheck";