diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-17 11:41:00 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-17 11:41:00 +0100 |
commit | 3d6bed44c8ca414f60c03223482b9f7b94d56c14 (patch) | |
tree | 9b015da930eaf9856b5f05707245327185fff884 /sd/source/ui/tools | |
parent | a4babcc4a08648e99d988fca640ab555da10048c (diff) |
removetooltypes01: #i112600# Remove tools types from sd
Diffstat (limited to 'sd/source/ui/tools')
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/tools/IconCache.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 12e7b6b52e95..de4d53b73495 100644..100755 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -50,17 +50,17 @@ private: */ static IconCache* mpInstance; - typedef ::std::hash_map<USHORT,Image> ImageContainer; + typedef ::std::hash_map<sal_uInt16,Image> ImageContainer; ImageContainer maContainer; - Image GetIcon (USHORT nResourceId); + Image GetIcon (sal_uInt16 nResourceId); }; IconCache* IconCache::Implementation::mpInstance = NULL; -Image IconCache::Implementation::GetIcon (USHORT nResourceId) +Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) { Image aResult; ImageContainer::iterator iImage; @@ -109,7 +109,7 @@ IconCache& IconCache::Instance (void) -Image IconCache::GetIcon (USHORT nResourceId) +Image IconCache::GetIcon (sal_uInt16 nResourceId) { return mpImpl->GetIcon (nResourceId); } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 3b6e8339c22d..d4f6d056fc90 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -211,12 +211,12 @@ Image PreviewRenderer::RenderSubstitution ( const Rectangle aPaintRectangle ( Point(0,0), mpPreviewDevice->GetOutputSizePixel()); - mpPreviewDevice->EnableMapMode(FALSE); + mpPreviewDevice->EnableMapMode(sal_False); mpPreviewDevice->SetLineColor(); svtools::ColorConfig aColorConfig; mpPreviewDevice->SetFillColor(aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor); mpPreviewDevice->DrawRect (aPaintRectangle); - mpPreviewDevice->EnableMapMode(TRUE); + mpPreviewDevice->EnableMapMode(sal_True); // Paint substitution text and a frame around it. PaintSubstitutionText (rSubstitutionText); @@ -327,7 +327,7 @@ void PreviewRenderer::PaintPage ( // Turn off online spelling and redlining. SdrOutliner* pOutliner = NULL; - ULONG nSavedControlWord (0); + sal_uLong nSavedControlWord (0); if (mpDocShellOfView!=NULL && mpDocShellOfView->GetDoc()!=NULL) { pOutliner = &mpDocShellOfView->GetDoc()->GetDrawOutliner(); @@ -373,7 +373,7 @@ void PreviewRenderer::PaintSubstitutionText (const String& rSubstitutionText) Point(0,0), mpPreviewDevice->PixelToLogic( mpPreviewDevice->GetOutputSizePixel())); - USHORT nTextStyle = + sal_uInt16 nTextStyle = TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE @@ -396,11 +396,11 @@ void PreviewRenderer::PaintFrame (void) Rectangle aPaintRectangle ( Point(0,0), mpPreviewDevice->GetOutputSizePixel()); - mpPreviewDevice->EnableMapMode(FALSE); + mpPreviewDevice->EnableMapMode(sal_False); mpPreviewDevice->SetLineColor(maFrameColor); mpPreviewDevice->SetFillColor(); mpPreviewDevice->DrawRect(aPaintRectangle); - mpPreviewDevice->EnableMapMode(TRUE); + mpPreviewDevice->EnableMapMode(sal_True); } } |