[Libreoffice-commits] core.git: 3 commits - avmedia/source canvas/source chart2/source comphelper/source compilerplugins/clang configmgr/source cui/source drawinglayer/source extensions/source filter/source forms/source fpicker/source framework/source include/comphelper include/tools include/vcl lotuswordpro/source sc/source sdext/source sd/source sfx2/source soltools/mkdepend sot/source stoc/source store/source svl/source svtools/source svx/source sw/qa sw/source tools/source unotools/source vcl/inc vcl/osx vcl/qa vcl/source vcl/unx vcl/win vcl/workben
Noel Grandin
noel at peralex.com
Thu Apr 2 00:40:47 PDT 2015
avmedia/source/gstreamer/gstframegrabber.cxx | 2
canvas/source/cairo/cairo_canvasbitmap.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 2
chart2/source/model/main/ChartModel_Persistence.cxx | 2
comphelper/source/misc/configuration.cxx | 8 -
compilerplugins/clang/staticmethods.cxx | 14 +++
configmgr/source/components.hxx | 2
cui/source/dialogs/colorpicker.cxx | 6 -
cui/source/tabpages/grfpage.cxx | 2
drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 2
extensions/source/config/ldap/ldapuserprofilebe.hxx | 4
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 4
extensions/source/plugin/unx/npnapi.cxx | 14 +--
extensions/source/propctrlr/browserline.cxx | 4
extensions/source/update/check/updatecheck.cxx | 2
extensions/source/update/check/updatehdl.cxx | 2
extensions/source/update/check/updatehdl.hxx | 6 -
filter/source/flash/swfwriter1.cxx | 2
filter/source/graphicfilter/egif/egif.cxx | 2
filter/source/graphicfilter/epbm/epbm.cxx | 2
filter/source/graphicfilter/epgm/epgm.cxx | 2
filter/source/graphicfilter/epict/epict.cxx | 2
filter/source/graphicfilter/eppm/eppm.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 4
filter/source/graphicfilter/eras/eras.cxx | 2
filter/source/graphicfilter/etiff/etiff.cxx | 2
filter/source/graphicfilter/expm/expm.cxx | 2
filter/source/graphicfilter/icgm/bitmap.cxx | 2
filter/source/graphicfilter/icgm/bitmap.hxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/graphicfilter/ipbm/ipbm.cxx | 2
filter/source/graphicfilter/ipcd/ipcd.cxx | 2
filter/source/graphicfilter/ipict/ipict.cxx | 8 -
filter/source/graphicfilter/ipsd/ipsd.cxx | 6 -
filter/source/graphicfilter/itga/itga.cxx | 2
filter/source/graphicfilter/itiff/itiff.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/svdfppt.cxx | 2
forms/source/component/imgprod.cxx | 6 -
fpicker/source/office/iodlg.cxx | 4
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 2
include/comphelper/configuration.hxx | 42 +++-------
include/tools/inetmsg.hxx | 4
include/vcl/bitmap.hxx | 2
include/vcl/builder.hxx | 2
include/vcl/debugevent.hxx | 10 +-
include/vcl/settings.hxx | 4
lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/ui/app/inputwin.cxx | 4
sc/source/ui/dbgui/csvcontrol.cxx | 2
sc/source/ui/miscdlgs/autofmt.cxx | 2
sc/source/ui/pagedlg/scuitphfedit.cxx | 2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 4
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 2
sc/source/ui/sidebar/CellBorderUpdater.cxx | 4
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/tabview5.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/dlg/vectdlg.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 2
sd/source/ui/table/TableDesignPane.cxx | 2
sdext/source/minimizer/configurationaccess.hxx | 2
sdext/source/presenter/PresenterHelpView.cxx | 4
sdext/source/presenter/PresenterNotesView.cxx | 4
sdext/source/presenter/PresenterSlideSorter.cxx | 16 +--
sdext/source/presenter/PresenterToolBar.cxx | 8 -
sdext/source/presenter/PresenterWindowManager.cxx | 10 +-
sfx2/source/doc/templatedlg.cxx | 4
soltools/mkdepend/collectdircontent.hxx | 6 -
sot/source/sdstor/stgcache.hxx | 2
sot/source/sdstor/stgio.cxx | 2
sot/source/sdstor/stgstrms.cxx | 14 +--
stoc/source/inspect/introspection.cxx | 12 +-
stoc/source/invocation/invocation.cxx | 4
stoc/source/security/file_policy.cxx | 4
stoc/source/typeconv/convert.cxx | 6 -
store/source/storcach.cxx | 2
svl/source/config/asiancfg.cxx | 6 -
svl/source/config/itemholder2.hxx | 4
svl/source/fsstor/fsstorage.hxx | 2
svl/source/inc/passwordcontainer.hxx | 8 -
svl/source/misc/inethist.cxx | 2
svl/source/numbers/zforfind.hxx | 12 +-
svtools/source/control/tabbar.cxx | 4
svtools/source/graphic/grfmgr2.cxx | 8 -
svtools/source/graphic/transformer.cxx | 2
svtools/source/hatchwindow/ipwin.cxx | 4
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 2
svx/source/dialog/dlgctrl.cxx | 4
svx/source/dialog/svxruler.cxx | 2
svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 4
svx/source/sidebar/nbdtmg.cxx | 10 +-
svx/source/sidebar/possize/SidebarDialControl.cxx | 2
svx/source/svdraw/svdetc.cxx | 2
svx/source/svdraw/svdoashp.cxx | 4
svx/source/tbxctrls/tbxcolorupdate.cxx | 4
svx/source/xoutdev/_xoutbmp.cxx | 4
svx/source/xoutdev/xattrbmp.cxx | 2
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 6 -
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/ui/table/tautofmt.cxx | 2
sw/source/uibase/docvw/HeaderFooterWin.cxx | 2
sw/source/uibase/docvw/PageBreakWin.cxx | 2
sw/source/uibase/docvw/SidebarWin.cxx | 6 -
sw/source/uibase/misc/swruler.cxx | 2
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2
tools/source/inet/inetmsg.cxx | 2
unotools/source/config/bootstrap.cxx | 8 -
unotools/source/config/compatibility.cxx | 4
unotools/source/config/dynamicmenuoptions.cxx | 6 -
unotools/source/config/itemholder1.hxx | 4
unotools/source/config/misccfg.cxx | 2
unotools/source/config/moduleoptions.cxx | 18 ++--
unotools/source/config/searchopt.cxx | 4
vcl/inc/cupsmgr.hxx | 2
vcl/inc/dndevdis.hxx | 12 +-
vcl/inc/graphite_features.hxx | 4
vcl/inc/headless/svpgdi.hxx | 2
vcl/osx/salframe.cxx | 2
vcl/osx/salframeview.mm | 8 -
vcl/osx/salnativewidgets.cxx | 10 +-
vcl/qa/cppunit/canvasbitmaptest.cxx | 4
vcl/source/app/settings.cxx | 4
vcl/source/control/edit.cxx | 2
vcl/source/control/menubtn.cxx | 2
vcl/source/edit/vclmedit.cxx | 4
vcl/source/filter/igif/gifread.cxx | 12 +-
vcl/source/filter/ixbm/xbmread.cxx | 4
vcl/source/filter/ixpm/xpmread.cxx | 12 +-
vcl/source/filter/jpeg/JpegReader.cxx | 14 +--
vcl/source/filter/jpeg/JpegWriter.cxx | 2
vcl/source/filter/wmf/winwmf.cxx | 4
vcl/source/gdi/bitmap.cxx | 34 ++++----
vcl/source/gdi/bitmap3.cxx | 38 ++++-----
vcl/source/gdi/bitmapex.cxx | 12 +-
vcl/source/gdi/dibtools.cxx | 8 -
vcl/source/gdi/impimage.cxx | 6 -
vcl/source/gdi/impvect.cxx | 4
vcl/source/gdi/pngread.cxx | 4
vcl/source/gdi/pngwrite.cxx | 8 -
vcl/source/gdi/print2.cxx | 2
vcl/source/gdi/salgdilayout.cxx | 4
vcl/source/helper/canvasbitmap.cxx | 4
vcl/source/outdev/bitmap.cxx | 20 ++--
vcl/source/outdev/outdev.cxx | 2
vcl/source/outdev/text.cxx | 2
vcl/source/outdev/transparent.cxx | 4
vcl/source/window/dndevdis.cxx | 2
vcl/source/window/floatwin.cxx | 2
vcl/source/window/window.cxx | 4
vcl/source/window/winproc.cxx | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/generic/window/salframe.cxx | 8 -
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 20 ++--
vcl/unx/gtk/window/gtksalframe.cxx | 8 -
vcl/win/source/gdi/salnativewidgets-luna.cxx | 8 -
vcl/win/source/window/salframe.cxx | 6 -
vcl/workben/svptest.cxx | 2
164 files changed, 422 insertions(+), 418 deletions(-)
New commits:
commit e9cb5577f4c1be0f59863ec5ccb68e8794a2f117
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 1 16:23:59 2015 +0200
loplugin:staticmethods
Change-Id: Ibf0c73ac17ec19ed672f66907db47057920babca
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 71f1bf7..f240530 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -191,7 +191,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
}
}
- aBmp.ReleaseAccess( pWrite );
+ Bitmap::ReleaseAccess( pWrite );
#ifndef AVMEDIA_GST_0_10
gst_buffer_unmap( pBuf, &aMapInfo );
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 22ca7fd..fe9b378 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -169,7 +169,7 @@ namespace cairocanvas
}
aMask.ReleaseAccess( pMaskWrite );
}
- aRGB.ReleaseAccess( pRGBWrite );
+ ::Bitmap::ReleaseAccess( pRGBWrite );
}
// ignore potential errors above. will get caller a
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 7296979..6157ea6 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -639,7 +639,7 @@ namespace cairocanvas
}
}
- aBitmap.ReleaseAccess( pBitmapReadAcc );
+ ::Bitmap::ReleaseAccess( pBitmapReadAcc );
if( pAlphaReadAcc )
aAlpha.ReleaseAccess( pAlphaReadAcc );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index b6a20b8..b0d009c 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1320,7 +1320,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
if( aTemplateWithService.first.is())
aTemplateWithService.first->resetStyles( xDiagram );//#i109371#
xTemplate->changeDiagram( xDiagram );
- if( Application::GetSettings().GetMathLayoutRTL() )
+ if( AllSettings::GetMathLayoutRTL() )
AxisHelper::setRTLAxisLayout( AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 ) );
ThreeDHelper::setScheme( xDiagram, e3DScheme );
}
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index b0d96fd..f7f5fcc 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -349,7 +349,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
if( aTemplateWithService.first.is())
aTemplateWithService.first->resetStyles( xDiagram );
xTemplate->changeDiagram( xDiagram );
- if( Application::GetSettings().GetMathLayoutRTL() )
+ if( AllSettings::GetMathLayoutRTL() )
AxisHelper::setRTLAxisLayout( AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 ) );
if( rParameter.b3DLook )
ThreeDHelper::setScheme( xDiagram, rParameter.eThreeDLookScheme );
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 23a3c29..2535c75 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -411,7 +411,7 @@ void ChartModel::insertDefaultChart()
setFirstDiagram( xDiagram );
- bool bIsRTL = Application::GetSettings().GetMathLayoutRTL();
+ bool bIsRTL = AllSettings::GetMathLayoutRTL();
//reverse x axis for rtl charts
if( bIsRTL )
AxisHelper::setRTLAxisLayout( AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 ) );
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index b3f1b58..eb5c06b 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -61,6 +61,9 @@ std::string StaticMethods::getFilename(SourceLocation loc)
return compiler.getSourceManager().getFilename(spellingLocation);
}
+static bool startsWith(const std::string& rStr, const char* pSubStr) {
+ return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
+}
bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) {
if (ignoreLocation(pCXXMethodDecl)) {
@@ -109,6 +112,10 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
if (aParentName == "osl::OGlobalTimer") {
return true;
}
+ // leave the TopLeft() method alone for consistency with the other "corner" methods
+ if (aParentName == "BitmapInfoAccess") {
+ return true;
+ }
// can't change it because in debug mode it can't be static
// sal/cpprt/operators_new_delete.cxx
if (aParentName == "(anonymous namespace)::AllocatorTraits") {
@@ -119,6 +126,13 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
if (aParentName == "(anonymous namespace)::recently_used_item") {
return true;
}
+ // the unotools and svl config code stuff is doing weird stuff with a reference-counted statically allocated pImpl class
+ if (startsWith(getFilename(pCXXMethodDecl->getCanonicalDecl()->getLocStart()), SRCDIR "/include/unotools")) {
+ return true;
+ }
+ if (startsWith(getFilename(pCXXMethodDecl->getCanonicalDecl()->getLocStart()), SRCDIR "/include/svl")) {
+ return true;
+ }
bVisitedThis = false;
TraverseStmt(pCXXMethodDecl->getBody());
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 798597b..d1015e84 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -518,7 +518,7 @@ void ColorFieldControl::UpdateBitmap()
break;
}
- mpBitmap->ReleaseAccess( pWriteAccess );
+ Bitmap::ReleaseAccess( pWriteAccess );
}
}
@@ -563,7 +563,7 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate )
{
// mpBitmap always has a bit count of 24 => use of GetPixel(...) is safe
maColor = pReadAccess->GetPixel( nY, nX );
- mpBitmap->ReleaseAccess( pReadAccess );
+ Bitmap::ReleaseAccess( pReadAccess );
pReadAccess = NULL;
}
}
@@ -836,7 +836,7 @@ void ColorSliderControl::UpdateBitmap()
break;
}
- mpBitmap->ReleaseAccess( pWriteAccess );
+ Bitmap::ReleaseAccess( pWriteAccess );
}
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index c9ced2c..eeac4d7 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -491,7 +491,7 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
m_pRightMF->SetValue( m_pRightMF->Normalize( nRight ), eUnit );
}
}
- if (Application::GetSettings().GetLayoutRTL())
+ if (AllSettings::GetLayoutRTL())
{
m_pExampleWN->SetLeft(nRight);
m_pExampleWN->SetRight(nLeft);
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 4ddd4dd..6ccd174 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -116,7 +116,7 @@ namespace
}
aAlpha.ReleaseAccess(pAlpha);
- aContent.ReleaseAccess(pContent);
+ Bitmap::ReleaseAccess(pContent);
aRetval = BitmapEx(aContent, aAlpha);
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 8cfbc3c..bd0b335 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -274,7 +274,7 @@ namespace pcr
aText.append("...........");
// for Issue 69452
- if (Application::GetSettings().GetLayoutRTL())
+ if (AllSettings::GetLayoutRTL())
{
sal_Unicode cRTL_mark = 0x200F;
aText.append( OUString(cRTL_mark) );
@@ -290,7 +290,7 @@ namespace pcr
OUString sDisplayName = m_aFtTitle.GetText();
// for Issue 69452
- if (Application::GetSettings().GetLayoutRTL())
+ if (AllSettings::GetLayoutRTL())
{
sal_Unicode cRTL_mark = 0x200F;
sDisplayName = comphelper::string::stripEnd(sDisplayName, cRTL_mark);
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 2b532d8..06dcb73 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -779,7 +779,7 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga
aAlpha.ReleaseAccess( pAAcc );
}
- aBmp.ReleaseAccess( pRAcc );
+ Bitmap::ReleaseAccess( pRAcc );
}
}
}
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 4cbbe20..621cf32 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -284,7 +284,7 @@ bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
void GIFWriter::DestroyAccess()
{
- aAccBmp.ReleaseAccess( m_pAcc );
+ Bitmap::ReleaseAccess( m_pAcc );
m_pAcc = NULL;
}
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index b9b9bfa..1e1118a 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -99,7 +99,7 @@ bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
if ( ImplWriteHeader() )
ImplWriteBody();
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index c27fab0..71b3309 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -95,7 +95,7 @@ bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
{
ImplWriteBody();
}
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 93936b4..e9a7568 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -1266,7 +1266,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
nWrittenBitmaps++;
nActBitmapPercent = 0;
if ( pAcc )
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
}
void PictWriter::WriteOpcode_EndOfFile()
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index 258f072..dfd48d3 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -97,7 +97,7 @@ bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
{
ImplWriteBody();
}
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 1653528..edd7061 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -572,7 +572,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
nCount2--;
}
}
- aTmpBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
ImplExecMode( PS_RET );
ImplWriteLine( "%%EndPreview" );
}
@@ -2074,7 +2074,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi
else
ImplWriteLine( "pom" );
- aTileBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
nHeightLeft -= nHeight;
if ( nHeightLeft )
{
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index 589f698..3950a40 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -123,7 +123,7 @@ bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConf
m_rOStm.SetEndian( nOStmOldModus );
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index a4b2768..619187c 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -224,7 +224,7 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterCo
m_rOStm.WriteUInt16( mnTagCount );
m_rOStm.Seek( nCurPos );
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index b8e7a47..fca1788 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -132,7 +132,7 @@ bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
m_rOStm.SetEndian(nOStmOldModus);
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index a7fcbe5..8a6953a 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -203,7 +203,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
if ( rDesc.mpAcc )
{
- rDesc.mpBitmap->ReleaseAccess( rDesc.mpAcc );
+ Bitmap::ReleaseAccess( rDesc.mpAcc );
rDesc.mpAcc = NULL;
}
if ( rDesc.mbStatus == false )
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx
index 3b6a80d..732a3d4 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -66,7 +66,7 @@ class CGMBitmapDescriptor
~CGMBitmapDescriptor()
{
if ( mpAcc )
- mpBitmap->ReleaseAccess( mpAcc );
+ ::Bitmap::ReleaseAccess( mpAcc );
delete mpBitmap;
};
};
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 93800c5..b933574 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -697,7 +697,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
aGraphic = aMtf;
bHasPreview = bRetValue = true;
}
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
}
}
}
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 9547294..6415066 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -131,7 +131,7 @@ bool PBMReader::ReadPBM(Graphic & rGraphic )
if ( mpAcc )
{
- maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+ Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
}
if ( mbStatus )
rGraphic = maBmp;
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 3bbdc80..d1b5217 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -161,7 +161,7 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
ReadImage();
- aBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+ Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
rGraphic = aBmp;
}
return bStatus;
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index ed4da5b..9ab206f 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -304,9 +304,9 @@ public:
#define BITMAPERROR \
{ \
if ( pAcc ) \
- aBitmap.ReleaseAccess( pAcc ); \
+ Bitmap::ReleaseAccess( pAcc ); \
if ( pReadAcc ) \
- aBitmap.ReleaseAccess( pReadAcc ); \
+ Bitmap::ReleaseAccess( pReadAcc ); \
return 0xffffffff; \
}
@@ -1107,8 +1107,8 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
else
BITMAPERROR;
if ( pReadAcc )
- aBitmap.ReleaseAccess( pReadAcc );
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pReadAcc );
+ Bitmap::ReleaseAccess( pAcc );
rBitmap = aBitmap;
return nDataSize;
}
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index c3c767c..222f90d 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -160,11 +160,11 @@ bool PSDReader::ReadPSD(Graphic & rGraphic )
else
mbStatus = false;
if ( mpWriteAcc )
- maBmp.ReleaseAccess( mpWriteAcc );
+ Bitmap::ReleaseAccess( mpWriteAcc );
if ( mpReadAcc )
- maBmp.ReleaseAccess( mpReadAcc );
+ Bitmap::ReleaseAccess( mpReadAcc );
if ( mpMaskWriteAcc )
- maMaskBmp.ReleaseAccess( mpMaskWriteAcc );
+ Bitmap::ReleaseAccess( mpMaskWriteAcc );
return mbStatus;
}
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index 29dc073..1fd3df8 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -161,7 +161,7 @@ bool TGAReader::ReadTGA(Graphic & rGraphic)
mbStatus = false;
if ( mpAcc )
- aBitmap.ReleaseAccess ( mpAcc), mpAcc = NULL;
+ Bitmap::ReleaseAccess ( mpAcc), mpAcc = NULL;
if ( mbStatus )
rGraphic = aBitmap;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 7bc0f03..c34bc0b 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1356,7 +1356,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
if( pAcc )
{
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
if ( pMaskAcc )
{
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 8a0ecd5..b2f7093 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1205,7 +1205,7 @@ void ApplyRectangularGradientAsBitmap( const SvxMSDffManager& rManager, SvStream
pAcc->SetPixel( nY, nX, BitmapColor( static_cast< sal_Int8 >( nRed ), static_cast< sal_Int8 >( nGreen ), static_cast< sal_Int8 >( nBlue ) ) );
}
}
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
if ( nFix16Angle )
{
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 47e05d2..1a55e46 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5592,7 +5592,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s
}
}
}
- aBmp.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
sal_uInt32 nC = ( aSize.Width() * aSize.Height() );
nRt /= nC;
nGn /= nC;
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 3e53fdf..913a0a7 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -426,7 +426,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
(*iter)->setColorModel( pBmpAcc->GetBitCount(),aRGBPal, nRMask, nGMask, nBMask, nAMask );
}
- aBmp.ReleaseAccess( pBmpAcc );
+ Bitmap::ReleaseAccess( pBmpAcc );
mbConsInit = true;
}
}
@@ -534,8 +534,8 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
(*iter)->setPixelsByLongs( nStartX, nStartY, nPartWidth, nPartHeight, aData, 0UL, nPartWidth );
}
- aBmp.ReleaseAccess( pBmpAcc );
- aMask.ReleaseAccess( pMskAcc );
+ Bitmap::ReleaseAccess( pBmpAcc );
+ Bitmap::ReleaseAccess( pMskAcc );
}
}
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index e3d35fa..e96f436 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -420,7 +420,7 @@ throw( SAXException, RuntimeException, std::exception )
//fix for fdo#39370
/// check whether RTL interface or not
- if(Application::GetSettings().GetLayoutRTL()){
+ if(AllSettings::GetLayoutRTL()){
if (aCommandURL == ".uno:ParaLeftToRight")
aCommandURL = ".uno:ParaRightToLeft";
else if (aCommandURL == ".uno:ParaRightToLeft")
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 89fef35..7d71a66 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -860,7 +860,7 @@ public:
BitmapInfoAccess* AcquireInfoAccess();
BitmapReadAccess* AcquireReadAccess();
BitmapWriteAccess* AcquireWriteAccess();
- void ReleaseAccess( BitmapInfoAccess* pAccess );
+ static void ReleaseAccess( BitmapInfoAccess* pAccess );
typedef vcl::ScopedBitmapAccess<BitmapReadAccess, Bitmap, &Bitmap::AcquireReadAccess> ScopedReadAccess;
typedef vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &Bitmap::AcquireWriteAccess> ScopedWriteAccess;
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 824e2c4..179ca33 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -354,7 +354,7 @@ private:
bool extractGroup(const OString &id, stringmap &rVec);
bool extractModel(const OString &id, stringmap &rVec);
bool extractBuffer(const OString &id, stringmap &rVec);
- bool extractAdjustmentToMap(const OString &id, stringmap &rVec, std::vector<WidgetAdjustmentMap>& rAdjustmentMap);
+ static bool extractAdjustmentToMap(const OString &id, stringmap &rVec, std::vector<WidgetAdjustmentMap>& rAdjustmentMap);
bool extractButtonImage(const OString &id, stringmap &rMap, bool bRadio);
bool extractStock(const OString &id, stringmap &rMap);
void extractMnemonicWidget(const OString &id, stringmap &rMap);
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index 868fd88..6dc3dbf 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -21,11 +21,11 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer {
sal_uInt32 mnEventsLeft;
DebugEventInjector( sal_uInt32 nMaxEvents );
- vcl::Window *ChooseWindow();
- void InjectTextEvent();
- void InjectMenuEvent();
- void InjectEvent();
- void InjectKeyNavEdit();
+ static vcl::Window *ChooseWindow();
+ static void InjectTextEvent();
+ static void InjectMenuEvent();
+ static void InjectEvent();
+ static void InjectKeyNavEdit();
virtual void Invoke() SAL_OVERRIDE;
public:
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index b514296..d2313c5 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -654,8 +654,8 @@ public:
void SetLanguageTag( const LanguageTag& rLanguageTag );
const LanguageTag& GetLanguageTag() const;
const LanguageTag& GetUILanguageTag() const;
- bool GetLayoutRTL() const; // returns true if UI language requires right-to-left Text Layout
- bool GetMathLayoutRTL() const; // returns true if UI language requires right-to-left Math Layout
+ static bool GetLayoutRTL(); // returns true if UI language requires right-to-left Text Layout
+ static bool GetMathLayoutRTL(); // returns true if UI language requires right-to-left Math Layout
const LocaleDataWrapper& GetLocaleDataWrapper() const;
const LocaleDataWrapper& GetUILocaleDataWrapper() const;
const vcl::I18nHelper& GetLocaleI18nHelper() const;
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index ffaa752..107850d 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -118,7 +118,7 @@ XFBGImage* LwpBackgroundStuff::GetFillPattern()
BitmapWriteAccess* pWA = aBmp.AcquireWriteAccess();
sal_uInt8* pBuf = pWA->GetBuffer();
memcpy(pBuf, aPttnArray, 32);
- aBmp.ReleaseAccess(pWA);
+ Bitmap::ReleaseAccess(pWA);
// create XOBitmap object from bitmap object
XOBitmap aXOBitmap( aBmp );
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index e4366f2..62c2bea 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -395,7 +395,7 @@ void XclExpImgData::Save( XclExpStream& rStrm )
rStrm.EndRecord();
}
- aBmp.ReleaseAccess( pAccess );
+ Bitmap::ReleaseAccess( pAccess );
}
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 747ff2e..a70b069 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1448,7 +1448,7 @@ ScTextWnd::ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh )
{
EnableRTL( false ); // EditEngine can't be used with VCL EnableRTL
- bIsRTL = GetSettings().GetLayoutRTL();
+ bIsRTL = AllSettings::GetLayoutRTL();
// always use application font, so a font with cjk chars can be installed
vcl::Font aAppFont = GetFont();
@@ -1994,7 +1994,7 @@ void ScTextWnd::MakeDialogEditView()
void ScTextWnd::ImplInitSettings()
{
- bIsRTL = GetSettings().GetLayoutRTL();
+ bIsRTL = AllSettings::GetLayoutRTL();
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index 4b42c91..ac0b16c 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -36,7 +36,7 @@ ScCsvLayoutData::ScCsvLayoutData() :
mnPosCursor( CSV_POS_INVALID ),
mnColCursor( 0 ),
mnNoRepaint( 0 ),
- mbAppRTL( !!Application::GetSettings().GetLayoutRTL() )
+ mbAppRTL( !!AllSettings::GetLayoutRTL() )
{
}
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index b062a3e..ffd54c8 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -505,7 +505,7 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
DrawRect( aRect );
Point aPos( (aWndSize.Width() - aPrvSize.Width()) / 2, (aWndSize.Height() - aPrvSize.Height()) / 2 );
- if (Application::GetSettings().GetLayoutRTL())
+ if (AllSettings::GetLayoutRTL())
aPos.X() = -aPos.X();
DrawOutDev( aPos, aWndSize, Point(), aWndSize, aVD );
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 7c5e01c..dcac934 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -112,7 +112,7 @@ ScHFEditPage::ScHFEditPage( vcl::Window* pParent,
m_pFtCustomHF->Show();
//swap left/right areas and their labels in RTL mode
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
{
vcl::Window *pLeft = get<vcl::Window>("labelFT_LEFT");
vcl::Window *pRight = get<vcl::Window>("labelFT_RIGHT");
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index dcb9b89..af0bfe8 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -326,7 +326,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
if(pBoxItem->GetBottom())
mbBottom = true;
- if(!Application::GetSettings().GetLayoutRTL())
+ if(!AllSettings::GetLayoutRTL())
mpCellBorderUpdater->UpdateCellBorder(mbTop, mbBottom, mbLeft, mbRight, maIMGCellBorder, mbVer, mbHor);
else
mpCellBorderUpdater->UpdateCellBorder(mbTop, mbBottom, mbRight, mbLeft, maIMGCellBorder, mbVer, mbHor);
@@ -369,7 +369,7 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::BOTTOM ) || mbBottom)
bBottom = true;
- if(!Application::GetSettings().GetLayoutRTL())
+ if(!AllSettings::GetLayoutRTL())
mpCellBorderUpdater->UpdateCellBorder(bTop, bBottom, bLeft, bRight, maIMGCellBorder, mbVer, mbHor);
else
mpCellBorderUpdater->UpdateCellBorder(bTop, bBottom, bRight, bLeft, maIMGCellBorder, mbVer, mbHor);
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 5fad23d..08f7417 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -216,7 +216,7 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox)
break;
case TBI_BORDER2_RIGHT:
- if(!Application::GetSettings().GetLayoutRTL())
+ if(!AllSettings::GetLayoutRTL())
{
pRight = &theDefLine;
nValidFlags |= FRM_VALID_RIGHT;
diff --git a/sc/source/ui/sidebar/CellBorderUpdater.cxx b/sc/source/ui/sidebar/CellBorderUpdater.cxx
index 98f0e26..83f1ee8 100644
--- a/sc/source/ui/sidebar/CellBorderUpdater.cxx
+++ b/sc/source/ui/sidebar/CellBorderUpdater.cxx
@@ -104,9 +104,9 @@ void CellBorderUpdater::UpdateCellBorder(bool bTop, bool bBot, bool bLeft, bool
}
}
- aBmp.ReleaseAccess( pBmpAcc );
+ Bitmap::ReleaseAccess( pBmpAcc );
if( pMskAcc )
- aMsk.ReleaseAccess( pMskAcc );
+ Bitmap::ReleaseAccess( pMskAcc );
if( aBmpEx.IsAlpha() )
aBmpEx = BitmapEx( aBmp, AlphaMask( aMsk ) );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5c301f0..7b1959f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1095,7 +1095,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec
ScFilterBoxMode eFilterMode = bDataSelect ? SC_FILTERBOX_DATASELECT : SC_FILTERBOX_FILTER;
mpFilterBox.reset(new ScFilterListBox(mpFilterFloat.get(), this, nCol, nRow, eFilterMode));
// Fix for bug fdo#44925
- if (Application::GetSettings().GetLayoutRTL() != bLayoutRTL)
+ if (AllSettings::GetLayoutRTL() != bLayoutRTL)
mpFilterBox->EnableMirroring();
nSizeX += 1;
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index eb5a336..21694cb 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -106,7 +106,7 @@ void ScTabView::Init()
is needed to draw the 3D effect correctly. The base TabBar implementes
mirroring independent from the GUI direction. Have to set RTL mode
explicitly because the parent frame window is already RTL disabled. */
- pTabControl->EnableRTL( Application::GetSettings().GetLayoutRTL() );
+ pTabControl->EnableRTL( AllSettings::GetLayoutRTL() );
InitScrollBar( aHScrollLeft, MAXCOL+1 );
InitScrollBar( aHScrollRight, MAXCOL+1 );
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 5cef329..24ce6a4 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -300,7 +300,7 @@ void AnnotationWindow::InitControls()
// window control for author and date
mpMeta = new MultiLineEdit(this,0);
mpMeta->SetReadOnly();
- mpMeta->SetRightToLeft(Application::GetSettings().GetLayoutRTL());
+ mpMeta->SetRightToLeft(AllSettings::GetLayoutRTL());
mpMeta->AlwaysDisableInput(true);
mpMeta->SetCallHandlersOnInputDisabled(true);
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 2755789..71d6ed9 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -187,7 +187,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
AddTile( pRAcc, aNewMtf, nCountX * nTileX, nCountY * nTileY, nRestX, nRestY );
}
- aTmp.ReleaseAccess( pRAcc );
+ Bitmap::ReleaseAccess( pRAcc );
for( size_t n = 0, nCount = rMtf.GetActionSize(); n < nCount; n++ )
aNewMtf.AddAction( rMtf.GetAction( n )->Clone() );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4879b51..314d6b1 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -827,7 +827,7 @@ bool SlideshowImpl::startPreview(
else if( mpViewShell )
{
Rectangle aContentRect (mpViewShell->GetViewShellBase().getClientRectangle());
- if (Application::GetSettings().GetLayoutRTL())
+ if (AllSettings::GetLayoutRTL())
{
aContentRect.Left() = aContentRect.Right();
aContentRect.Right() += aContentRect.Right();
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
index 6a73706..07e9d28 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
@@ -83,7 +83,7 @@ void FramePainter::AdaptColor (
if (pReadAccess == NULL)
return;
const Color aSourceColor = pReadAccess->GetColor(0,0);
- maCenter.maBitmap.GetBitmap().ReleaseAccess(pReadAccess);
+ Bitmap::ReleaseAccess(pReadAccess);
// Erase the center bitmap.
if (bEraseCenter)
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 564b926..8e9f65b 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -728,7 +728,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
}
}
- aPreviewBmp.ReleaseAccess( pAccess );
+ Bitmap::ReleaseAccess( pAccess );
}
return aPreviewBmp;
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 4b3bf63..d0d22bf 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -315,7 +315,7 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
sal_Int32 RightX2 = aWindowBox.Width - gnHorizontalGap;
/* check whether RTL interface or not
then replace the windowbox position */
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
{
LeftX1 = aWindowBox.Width/2 + gnHorizontalGap;
LeftX2 = aWindowBox.Width - gnHorizontalGap;
@@ -581,7 +581,7 @@ double LineDescriptorList::Paint(
{
double nX;
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL())
+ if(!AllSettings::GetLayoutRTL())
{
nX = rBBox.X1;
if ( ! bFlushLeft)
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 079b89a..2619173 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -456,7 +456,7 @@ void PresenterNotesView::Layout (void)
if (nHeight > nTextBoxHeight)
{
bShowVerticalScrollbar = true;
- if(!Application::GetSettings().GetLayoutRTL())
+ if(!AllSettings::GetLayoutRTL())
aNewTextBoundingBox.X2 -= mpScrollBar->GetSize();
else
aNewTextBoundingBox.X1 += mpScrollBar->GetSize();
@@ -467,7 +467,7 @@ void PresenterNotesView::Layout (void)
{
OSL_ASSERT(false);
}
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
{
mpScrollBar->SetVisible(bShowVerticalScrollbar);
mpScrollBar->SetPosSize(
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 4bf2d73..098e85d 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -512,7 +512,7 @@ void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rE
{
css::awt::MouseEvent rTemp =rEvent;
/// check whether RTL interface or not
- if(Application::GetSettings().GetLayoutRTL()){
+ if(AllSettings::GetLayoutRTL()){
awt::Rectangle aBox = mxWindow->getPosSize();
rTemp.X=aBox.Width-rEvent.X;
}
@@ -525,7 +525,7 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r
{
css::awt::MouseEvent rTemp =rEvent;
/// check whether RTL interface or not
- if(Application::GetSettings().GetLayoutRTL()){
+ if(AllSettings::GetLayoutRTL()){
awt::Rectangle aBox = mxWindow->getPosSize();
rTemp.X=aBox.Width-rEvent.X;
}
@@ -575,7 +575,7 @@ void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEve
{
css::awt::MouseEvent rTemp =rEvent;
/// check whether RTL interface or not
- if(Application::GetSettings().GetLayoutRTL()){
+ if(AllSettings::GetLayoutRTL()){
awt::Rectangle aBox = mxWindow->getPosSize();
rTemp.X=aBox.Width-rEvent.X;
}
@@ -757,7 +757,7 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
{
if (bIsScrollBarNeeded)
{
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
{
mpVerticalScrollBar->SetPosSize(geometry::RealRectangle2D(
rUpperBox.X1,
@@ -897,7 +897,7 @@ void PresenterSlideSorter::PaintPreview (
}
Reference<rendering::XBitmap> xPreview (GetPreview(nSlideIndex));
- bool isRTL = Application::GetSettings().GetLayoutRTL();
+ bool isRTL = AllSettings::GetLayoutRTL();
const geometry::RealPoint2D aTopLeft (
mpLayout->GetWindowPosition(
@@ -1269,7 +1269,7 @@ bool PresenterSlideSorter::Layout::IsScrollBarNeeded (const sal_Int32 nSlideCoun
geometry::RealPoint2D PresenterSlideSorter::Layout::GetLocalPosition(
const geometry::RealPoint2D& rWindowPoint) const
{
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
{
return css::geometry::RealPoint2D(
-rWindowPoint.X + maBoundingBox.X2 + mnHorizontalOffset,
@@ -1286,7 +1286,7 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetLocalPosition(
geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition(
const geometry::RealPoint2D& rLocalPoint) const
{
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
{
return css::geometry::RealPoint2D(
-rLocalPoint.X + mnHorizontalOffset + maBoundingBox.X2,
@@ -1384,7 +1384,7 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetPoint (
awt::Rectangle PresenterSlideSorter::Layout::GetBoundingBox (const sal_Int32 nSlideIndex) const
{
- bool isRTL = Application::GetSettings().GetLayoutRTL();
+ bool isRTL = AllSettings::GetLayoutRTL();
const geometry::RealPoint2D aWindowPosition(GetWindowPosition(GetPoint(nSlideIndex, isRTL?1:-1, -1)));
return PresenterGeometryHelper::ConvertRectangle(
geometry::RealRectangle2D(
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 442c898..05d88a6 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -793,7 +793,7 @@ void PresenterToolBar::Layout (
/* push front or back ? ... */
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL()){
+ if(!AllSettings::GetLayoutRTL()){
for (iPart=maElementContainer.begin(), nIndex=0; iPart!=iEnd; ++iPart,++nIndex)
{
geometry::RealRectangle2D aBoundingBox(
@@ -894,7 +894,7 @@ void PresenterToolBar::LayoutPart (
ElementContainerPart::const_iterator iBegin (rpPart->begin());
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL()){
+ if(!AllSettings::GetLayoutRTL()){
for (iElement=rpPart->begin(); iElement!=iEnd; ++iElement)
{
if (iElement->get() == NULL)
@@ -1025,7 +1025,7 @@ void PresenterToolBar::CheckMouseOver (
const bool bMouseDown)
{
css::awt::MouseEvent rTemp =rEvent;
- if(Application::GetSettings().GetLayoutRTL()){
+ if(AllSettings::GetLayoutRTL()){
awt::Rectangle aWindowBox = mxWindow->getPosSize();
rTemp.X=aWindowBox.Width-rTemp.X;
}
@@ -1582,7 +1582,7 @@ void Button::PaintIcon (
if (xBitmap.is())
{
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL()){
+ if(!AllSettings::GetLayoutRTL()){
const sal_Int32 nX (maLocation.X
+ (maSize.Width-xBitmap->getSize().Width) / 2);
const sal_Int32 nY (maLocation.Y
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 520b160..95406fa 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -669,7 +669,7 @@ void PresenterWindowManager::LayoutStandardMode (void)
nSlidePreviewTop = (aBox.Height - aCurrentSlideOuterBox.Height) / 2;
double Temp=nGap;
/// check whether RTL interface or not
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
Temp=aBox.Width - aCurrentSlideOuterBox.Width - nGap;
SetPanePosSizeAbsolute (
PresenterPaneFactory::msCurrentSlidePreviewPaneURL,
@@ -690,7 +690,7 @@ void PresenterWindowManager::LayoutStandardMode (void)
PresenterPaneFactory::msNextSlidePreviewPaneURL));
double Temp=aBox.Width - aNextSlideOuterBox.Width - nGap;
/// check whether RTL interface or not
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
Temp=nGap;
SetPanePosSizeAbsolute (
PresenterPaneFactory::msNextSlidePreviewPaneURL,
@@ -731,7 +731,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
- aToolBarBox.Y2 + aToolBarBox.Y1 - aNotesViewOuterSize.Height) / 2;
/// check whether RTL interface or not
double Temp=aBox.Width - aNotesViewOuterSize.Width - nGap;
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
Temp=nGap;
SetPanePosSizeAbsolute (
PresenterPaneFactory::msNotesPaneURL,
@@ -753,7 +753,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
PresenterPaneFactory::msCurrentSlidePreviewPaneURL));
/// check whether RTL interface or not
double Temp=nGap;
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
Temp=aBox.Width - aCurrentSlideOuterBox.Width - nGap;
SetPanePosSizeAbsolute (
PresenterPaneFactory::msCurrentSlidePreviewPaneURL,
@@ -774,7 +774,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
PresenterPaneFactory::msNextSlidePreviewPaneURL));
/// check whether RTL interface or not
double Temp=nGap;
- if(Application::GetSettings().GetLayoutRTL())
+ if(AllSettings::GetLayoutRTL())
Temp=aBox.Width - aNextSlideOuterBox.Width - nGap;
SetPanePosSizeAbsolute (
PresenterPaneFactory::msNextSlidePreviewPaneURL,
diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
index b2b3045..a4f8372 100644
--- a/svl/source/config/itemholder2.hxx
+++ b/svl/source/config/itemholder2.hxx
@@ -50,8 +50,8 @@ class ItemHolder2 : private ItemHolderMutexBase
void impl_addItem(EItem eItem);
void impl_releaseAllItems();
- void impl_newItem(TItemInfo& rItem);
- void impl_deleteItem(TItemInfo& rItem);
+ static void impl_newItem(TItemInfo& rItem);
+ static void impl_deleteItem(TItemInfo& rItem);
};
#endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 932ffda..28ba70b 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -57,7 +57,7 @@ public:
::ucbhelper::Content* GetContent();
- void CopyStreamToSubStream( const OUString& aSourceURL,
+ static void CopyStreamToSubStream( const OUString& aSourceURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
const OUString& aNewEntryName );
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index 86b26d7..b5fe90a 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -274,9 +274,9 @@ bool createUrlRecord(
bool bName, // only needed to support empty user names
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw(::com::sun::star::uno::RuntimeException);
- OUString GetDefaultMasterPassword();
+ static OUString GetDefaultMasterPassword();
- OUString RequestPasswordFromUser(
+ static OUString RequestPasswordFromUser(
::com::sun::star::task::PasswordRequestMode aRMode,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
@@ -293,10 +293,10 @@ bool createUrlRecord(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
throw(::com::sun::star::uno::RuntimeException);
- ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword )
+ static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword )
throw(::com::sun::star::uno::RuntimeException);
- OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword )
+ static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword )
throw(::com::sun::star::uno::RuntimeException);
public:
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 4d531c9..3987cbb 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -128,7 +128,7 @@ class INetURLHistory_Impl: private boost::noncopyable
return (sal_uInt16)(INETHIST_SIZE_LIMIT);
}
- sal_uInt32 crc32 (OUString const & rData) const
+ static sal_uInt32 crc32 (OUString const & rData)
{
return rtl_crc32 (0, rData.getStr(), rData.getLength() * sizeof(sal_Unicode));
}
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 1f03fb9..c9f260a 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -192,12 +192,12 @@ private:
// decimal separator has to be '.'
// If bForceFraction==true the string is taken to be the fractional part
// of 0.1234 without the leading 0. (thus being just "1234").
- double StringToDouble( const OUString& rStr,
- bool bForceFraction = false );
+ static double StringToDouble( const OUString& rStr,
+ bool bForceFraction = false );
// Next number/string symbol
- bool NextNumberStringSymbol( const sal_Unicode*& pStr,
- OUString& rSymbol );
+ static bool NextNumberStringSymbol( const sal_Unicode*& pStr,
+ OUString& rSymbol );
// Concatenate ,000,23 blocks
// in input to 000123
@@ -310,8 +310,8 @@ private:
sal_Int32& nPos );
// Get sign of exponent and advance string position
- short GetESign( const OUString& rString,
- sal_Int32& nPos );
+ static short GetESign( const OUString& rString,
+ sal_Int32& nPos );
// Get next number as array offset
inline bool GetNextNumber( sal_uInt16& i,
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index ad9345f..45807d3 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2287,12 +2287,12 @@ void TabBar::SetMirrored(bool bMirrored)
void TabBar::SetEffectiveRTL( bool bRTL )
{
- SetMirrored( bRTL != Application::GetSettings().GetLayoutRTL() );
+ SetMirrored( bRTL != AllSettings::GetLayoutRTL() );
}
bool TabBar::IsEffectiveRTL() const
{
- return IsMirrored() != Application::GetSettings().GetLayoutRTL();
+ return IsMirrored() != AllSettings::GetLayoutRTL();
}
void TabBar::SetMaxPageWidth( long nMaxWidth )
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 55b09cc..a8daae0 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -613,11 +613,11 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib
}
}
- aOutBmp.ReleaseAccess( pWriteAccess );
+ Bitmap::ReleaseAccess( pWriteAccess );
bRet = true;
}
- aBmp.ReleaseAccess( pReadAccess );
+ Bitmap::ReleaseAccess( pReadAccess );
}
// mask processing
@@ -846,12 +846,12 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib
pMapLY.reset();
if( pMAcc )
- aMsk.ReleaseAccess( pMAcc );
+ Bitmap::ReleaseAccess( pMAcc );
bRet = true;
}
- aOutMsk.ReleaseAccess( pWriteAccess );
+ Bitmap::ReleaseAccess( pWriteAccess );
}
if( bRet )
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 06c2595..9be39c0 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -70,7 +70,7 @@ void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int
}
}
}
- rBitmap.ReleaseAccess( pReadAccess );
+ Bitmap::ReleaseAccess( pReadAccess );
rAlpha.ReleaseAccess( pWriteAccess );
}
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index d347ad4..0d55780 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -211,7 +211,7 @@ Point SvResizeHelper::GetTrackPosPixel( const Rectangle & rRect ) const
Point aBR = aOuter.BottomRight();
Point aTR = aOuter.TopRight();
Point aBL = aOuter.BottomLeft();
- bool bRTL = Application::GetSettings().GetLayoutRTL();
+ bool bRTL = AllSettings::GetLayoutRTL();
switch( nGrab )
{
case 0:
@@ -276,7 +276,7 @@ Rectangle SvResizeHelper::GetTrackRectPixel( const Point & rTrackPos ) const
Point aDiff = rTrackPos - aSelPos;
aTrackRect = aOuter;
Point aBR = aOuter.BottomRight();
- bool bRTL = Application::GetSettings().GetLayoutRTL();
+ bool bRTL = AllSettings::GetLayoutRTL();
switch( nGrab )
{
case 0:
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 60d0bae..0498e6a 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -484,7 +484,7 @@ uno::Reference<XAccessible> SvxPixelCtlAccessible::CreateChild (long nIndex,Poin
{
long nX = mPoint.X();
long nY = mPoint.Y();
- if( Application::GetSettings().GetLayoutRTL())
+ if( AllSettings::GetLayoutRTL())
{
nX = (sal_uInt16) mrPixelCtl.GetWidth() - 1 - nX;
}
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 6606c64..075cc89 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -550,7 +550,7 @@ Point SvxRectCtl::SetActualRPWithoutInvalidate( RECT_POINT eNewRP )
aPtNew.Y() = aPtMM.Y();
// fdo#74751 this fix reverse base point on RTL UI.
- bool bRTL = Application::GetSettings().GetLayoutRTL();
+ bool bRTL = AllSettings::GetLayoutRTL();
eNewRP = GetRPFromPoint( aPtNew, bRTL );
eDefRP = eNewRP;
@@ -1087,7 +1087,7 @@ void SvxPixelCtl::SetXBitmap( const BitmapEx& rBitmapEx )
}
}
- aBitmap.ReleaseAccess(pRead);
+ Bitmap::ReleaseAccess(pRead);
}
}
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 6afcf3d..2ac5aae 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -983,7 +983,7 @@ void SvxRuler::UpdatePage()
long lPos = 0;
Point aOwnPos = GetPosPixel();
Point aEdtWinPos = pEditWin->GetPosPixel();
- if( Application::GetSettings().GetLayoutRTL() && bHorz )
+ if( AllSettings::GetLayoutRTL() && bHorz )
{
//#i73321# in RTL the window and the ruler is not mirrored but the
// influence of the vertical ruler is inverted
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 0ffbee0..21cf081 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -64,8 +64,8 @@ namespace drawinglayer
pWMask->SetPixel(2, 0, aMaskColor);
pWMask->SetPixel(2, 2, aMaskColor);
- aContent.ReleaseAccess(pWContent);
- aMask.ReleaseAccess(pWMask);
+ Bitmap::ReleaseAccess(pWContent);
+ Bitmap::ReleaseAccess(pWMask);
// create and exchange at aRetVal
delete aRetVal.set(new BitmapEx(aContent, aMask));
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 543dda1..f0e2ed0 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -298,7 +298,7 @@ sal_uInt16 BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
sal_Unicode cChar = aFmt.GetBulletChar();
//const vcl::Font* pFont = aFmt.GetBulletFont();
//sal_uInt16 nLength = 0;
- /*if( Application::GetSettings().GetLayoutRTL() )
+ /*if( AllSettings::GetLayoutRTL() )
{
nLength = sizeof(aDynamicRTLBulletTypes)/sizeof(sal_Unicode);
for(sal_uInt16 i = 0; i < nLength; i++)
@@ -354,7 +354,7 @@ bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
sal_Unicode cChar = aFmt.GetBulletChar();
const vcl::Font* pFont = aFmt.GetBulletFont();
//sal_uInt16 nLength = 0;
- /*if( Application::GetSettings().GetLayoutRTL() )
+ /*if( AllSettings::GetLayoutRTL() )
{
nLength = sizeof(aDynamicRTLBulletTypes)/sizeof(sal_Unicode);
@@ -396,7 +396,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
sal_Unicode cChar;
//sal_uInt16 nLength = 0;
- /*if( Application::GetSettings().GetLayoutRTL() )
+ /*if( AllSettings::GetLayoutRTL() )
{
nLength = sizeof(aDynamicRTLBulletTypes)/sizeof(sal_Unicode);
@@ -482,7 +482,7 @@ sal_Unicode BulletsTypeMgr::GetBulChar(sal_uInt16 nIndex)
else
cChar = pActualBullets[nIndex]->cBulletChar;
- /*if( Application::GetSettings().GetLayoutRTL() )
+ /*if( AllSettings::GetLayoutRTL() )
{
nLength = sizeof(aDynamicRTLBulletTypes)/sizeof(sal_Unicode);
@@ -1761,7 +1761,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
sal_Unicode cChar = 0;
if( !pLevelSettings->sBulletChar.isEmpty() )
cChar = pLevelSettings->sBulletChar[0];
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
{
if( 0 == i && cChar == BulletsTypeMgr::aDynamicBulletTypes[5] )
cChar = BulletsTypeMgr::aDynamicRTLBulletTypes[5];
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx
index b4d0bee..2f422a9 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -69,7 +69,7 @@ void SidebarDialControl::HandleMouseEvent( const Point& rPos, bool bInitial )
if( bInitial ) // round to entire 15 degrees
nAngle = ((nAngle + 750) / 1500) * 1500;
- if (Application::GetSettings().GetLayoutRTL())
+ if (AllSettings::GetLayoutRTL())
nAngle = 18000 - nAngle;
SetRotation( nAngle, true );
}
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 32eb75a..a4c62eb 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -375,7 +375,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
if(pAccess)
{
- aBitmap.ReleaseAccess(pAccess);
+ Bitmap::ReleaseAccess(pAccess);
}
break;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index a3826c7..238166b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -372,10 +372,10 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
}
}
- aDestBitmap.ReleaseAccess(pWriteAccess);
+ Bitmap::ReleaseAccess(pWriteAccess);
}
- aBitmap.ReleaseAccess(pReadAccess);
+ Bitmap::ReleaseAccess(pReadAccess);
if(aBitmapEx.IsTransparent())
{
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 27f9de9..13029b6 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -176,10 +176,10 @@ namespace svx
pMskAcc->DrawRect(maUpdRect);
}
- aBmp.ReleaseAccess(pBmpAcc);
+ Bitmap::ReleaseAccess(pBmpAcc);
if (pMskAcc)
- aMsk.ReleaseAccess(pMskAcc);
+ Bitmap::ReleaseAccess(pMskAcc);
if (aBmpEx.IsAlpha())
aBmpEx = BitmapEx(aBmp, AlphaMask(aMsk));
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index bc3ee58..ed76829 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -453,8 +453,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
bRet = true;
}
- aWorkBmp.ReleaseAccess( pReadAcc );
- aDstBmp.ReleaseAccess( pWriteAcc );
+ Bitmap::ReleaseAccess( pReadAcc );
+ Bitmap::ReleaseAccess( pWriteAcc );
if( bRet )
aRetBmp = aDstBmp;
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index e977f02..0518bdd 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -240,7 +240,7 @@ Bitmap createHistorical8x8FromArray(const sal_uInt16* pArray, Color aColorPix, C
}
}
- aBitmap.ReleaseAccess(pContent);
+ Bitmap::ReleaseAccess(pContent);
}
return aBitmap;
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c9360f4..bf54c2d 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2007,7 +2007,7 @@ DECLARE_OOXMLIMPORT_TEST(testPictureWithSchemeColor, "picture-with-schemecolor.d
CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd ));
aColor = pAccess->GetPixel(130, 260);
CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd ));
- aBitmap.ReleaseAccess(pAccess);
+ Bitmap::ReleaseAccess(pAccess);
}
DECLARE_OOXMLIMPORT_TEST(testFdo69656, "Table_cell_auto_width_fdo69656.docx")
@@ -2228,7 +2228,7 @@ DECLARE_OOXMLIMPORT_TEST(testMsoBrightnessContrast, "msobrightnesscontrast.docx"
CPPUNIT_ASSERT_EQUAL(320L, pAccess->Height());
Color aColor(pAccess->GetPixel(30, 20));
CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xce, 0xce, 0xce ));
- aBitmap.ReleaseAccess(pAccess);
+ Bitmap::ReleaseAccess(pAccess);
}
DECLARE_OOXMLIMPORT_TEST(testChartSize, "chart-size.docx")
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 16e6d44..5de2429 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3888,7 +3888,7 @@ void SwPageFrm::PaintDecorators( ) const
( gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Header ) ||
gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer ) ) )
{
- bool bRtl = Application::GetSettings().GetLayoutRTL();
+ bool bRtl = AllSettings::GetLayoutRTL();
const SwRect& rVisArea = gProp.pSGlobalShell->VisArea();
long nXOff = std::min( aBodyRect.Right(), rVisArea.Right() );
if ( bRtl )
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 722c5dc..fc4468e 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -558,7 +558,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
// calculate initial paint offset
Point aInitialPaintOffset;
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL()){
+ if(!AllSettings::GetLayoutRTL()){
if ( maPaintStartPageOffset != Point( -1, -1 ) )
aInitialPaintOffset = Point(0,0) - maPaintStartPageOffset;
else
@@ -616,7 +616,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
// first page in 2nd column
// --> continue with increased paint offset and next column
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL())
+ if(!AllSettings::GetLayoutRTL())
aCurrPaintOffset.X() += mnColWidth;
else aCurrPaintOffset.X() -= mnColWidth;
++nCurrCol;
@@ -642,7 +642,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
pPage = static_cast<const SwPageFrm*>(pPage->GetNext());
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL())
+ if(!AllSettings::GetLayoutRTL())
aCurrPaintOffset.X() += mnColWidth;
else aCurrPaintOffset.X() -= mnColWidth;
++nCurrCol;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index efe4b02..8810fb9 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4793,7 +4793,7 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
nDirection = rItem.GetValue();
}
if ( ( nDirection == FRMDIR_HORI_RIGHT_TOP ) ||
- ( nDirection == FRMDIR_ENVIRONMENT && Application::GetSettings().GetLayoutRTL() ) )
+ ( nDirection == FRMDIR_ENVIRONMENT && AllSettings::GetLayoutRTL() ) )
{
bBiDiSwap = true;
}
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 763208a..8a8c02a 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -530,7 +530,7 @@ void AutoFmtPreview::Resize()
void AutoFmtPreview::DetectRTL(SwWrtShell* pWrtShell)
{
if (!pWrtShell->IsCrsrInTbl()) // We haven't created the table yet
- mbRTL = Application::GetSettings().GetLayoutRTL();
+ mbRTL = AllSettings::GetLayoutRTL();
else
mbRTL = pWrtShell->IsTableRightToLeft();
}
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index de95e17..43dc81d 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -215,7 +215,7 @@ void SwHeaderFooterWin::SetOffset( Point aOffset, long nXLineStart, long nXLineE
Point aBoxPos( aOffset.X() - aBoxSize.Width() - BOX_DISTANCE,
aOffset.Y() - nYFooterOff );
- if ( Application::GetSettings().GetLayoutRTL() )
+ if ( AllSettings::GetLayoutRTL() )
{
aBoxPos.setX( aOffset.X() + BOX_DISTANCE );
}
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index b284290..42027fb 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -146,7 +146,7 @@ void SwPageBreakWin::Paint( const Rectangle& )
aOtherColor = rSettings.GetDialogColor( ).getBColor();
}
- bool bRtl = Application::GetSettings().GetLayoutRTL();
+ bool bRtl = AllSettings::GetLayoutRTL();
drawinglayer::primitive2d::Primitive2DSequence aSeq( 3 );
B2DRectangle aBRect( double( aRect.Left() ), double( aRect.Top( ) ),
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index d60987b..3832f7c 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -359,7 +359,7 @@ void SwSidebarWin::InitControls()
// window controls for author and date
mpMetadataAuthor = new Edit( this, 0 );
mpMetadataAuthor->SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) );
- mpMetadataAuthor->EnableRTL(Application::GetSettings().GetLayoutRTL());
+ mpMetadataAuthor->EnableRTL(AllSettings::GetLayoutRTL());
mpMetadataAuthor->SetReadOnly();
mpMetadataAuthor->AlwaysDisableInput(true);
mpMetadataAuthor->SetCallHandlersOnInputDisabled(true);
@@ -378,7 +378,7 @@ void SwSidebarWin::InitControls()
mpMetadataDate = new Edit( this, 0 );
mpMetadataDate->SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_DATE_NAME ) );
- mpMetadataDate->EnableRTL(Application::GetSettings().GetLayoutRTL());
+ mpMetadataDate->EnableRTL(AllSettings::GetLayoutRTL());
mpMetadataDate->SetReadOnly();
mpMetadataDate->AlwaysDisableInput(true);
mpMetadataDate->SetCallHandlersOnInputDisabled(true);
@@ -760,7 +760,7 @@ void SwSidebarWin::DoResize()
}
mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) );
- if (!Application::GetSettings().GetLayoutRTL())
+ if (!AllSettings::GetLayoutRTL())
{
mpSidebarTxtControl->setPosSizePixel(0, 0, aWidth, aHeight);
mpVScrollbar->setPosSizePixel( aWidth, 0, GetScrollbarWidth(), aHeight);
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 172a0b3..b9d43d0 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -97,7 +97,7 @@ void SwCommentRuler::DrawCommentControl()
// TODO Discover why it should be 0 instead of CONTROL_BORDER_WIDTH + CONTROL_TOP_OFFSET
aLabelPos.Y() = 0;
aArrowPos.Y() = CONTROL_BORDER_WIDTH + CONTROL_TOP_OFFSET;
- if ( !Application::GetSettings().GetLayoutRTL() )
+ if ( !AllSettings::GetLayoutRTL() )
{
// LTR
if ( bIsCollapsed )
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index ed85a10..9c72049 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -115,7 +115,7 @@ void WrapPropertyPanel::Initialize()
::GetImage( mxFrame, UNO_WRAPIDEAL, false ) );
mpRBNoWrap->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPOFF) );
- if ( Application::GetSettings().GetLayoutRTL() )
+ if ( AllSettings::GetLayoutRTL() )
{
mpRBWrapLeft->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPRIGHT) );
mpRBWrapRight->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPLEFT) );
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 4db4c1d..96b1c80 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -80,7 +80,7 @@ class CUPSManager : public PrinterInfoManager
virtual void initialize() SAL_OVERRIDE;
- void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions ) const;
+ static void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions );
void runDests();
OString threadedCupsGetPPD(const char* pPrinter);
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 60b6bb3..978910a 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -46,23 +46,23 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper3<
* fire the events on the dnd listener container of the specified window
*/
- sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+ static sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aFlavorList ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+ static sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(::com::sun::star::uno::RuntimeException);
+ static sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
+ static sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext,
const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int32 fireDropEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext,
+ static sal_Int32 fireDropEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext,
const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable ) throw(::com::sun::star::uno::RuntimeException);
- sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource,
+ static sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource,
const ::com::sun::star::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction )throw(::com::sun::star::uno::RuntimeException);
public:
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index e957b50..7b9c083 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -59,8 +59,8 @@ namespace grutils
private:
GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION;
void setLang(const gr_face * face, const OString & lang);
- bool isCharId(const OString & id, size_t offset, size_t length);
- gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
+ static bool isCharId(const OString & id, size_t offset, size_t length);
+ static gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
short getIntValue(const OString & id, size_t offset, size_t length);
size_t mnNumSettings;
FeatId maLang;
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 3d68e76..297d28a 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -54,7 +54,7 @@ protected:
basegfx::B2IVector GetSize() { return m_aOrigDevice->getSize(); }
public:
- GlyphCache& getPlatformGlyphCache();
+ static GlyphCache& getPlatformGlyphCache();
void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice);
void BlendTextColor(const basebmp::Color &rTextColor, const basebmp::BitmapDeviceSharedPtr &rAlphaMask,
const basegfx::B2IPoint &rDstPoint);
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index d177aa2..61dd536 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1265,7 +1265,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_u
if( mpParent )
{
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
{
if( (nFlags & SAL_FRAME_POSSIZE_WIDTH) != 0 )
nX = mpParent->maGeometry.nWidth - nWidth-1 - nX;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 04c6e90..67c0a9a 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -628,7 +628,7 @@ private:
aEvent.mnCode = aEvent.mnButton | nModMask;
// --- RTL --- (mirror mouse pos)
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pDispatchFrame->maGeometry.nWidth-1-aEvent.mnX;
pDispatchFrame->CallCallback( nEvent, &aEvent );
@@ -790,7 +790,7 @@ private:
aEvent.mbDeltaIsPixel = TRUE;
// --- RTL --- (mirror mouse pos)
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
aEvent.mnDelta = nDeltaZ;
@@ -846,7 +846,7 @@ private:
aEvent.mbDeltaIsPixel = TRUE;
// --- RTL --- (mirror mouse pos)
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
if( dX != 0.0 )
@@ -906,7 +906,7 @@ private:
aEvent.mbDeltaIsPixel = FALSE;
// --- RTL --- (mirror mouse pos)
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
if( dX != 0.0 )
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index cd2b8c5..559b418 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -746,7 +746,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
{
ButtonValue aButtonValue = aValue.getTristateVal();
- if( Application::GetSettings().GetLayoutRTL() && aButtonValue == BUTTONVALUE_OFF )
+ if( AllSettings::GetLayoutRTL() && aButtonValue == BUTTONVALUE_OFF )
{
// FIXME: a value of kThemeDisclosureLeft
// should draw a theme compliant left disclosure triangle
@@ -784,7 +784,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
case BUTTONVALUE_OFF:
// FIXME: this should have drawn a theme compliant disclosure triangle
// (see above)
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
{
aInfo.value = kThemeDisclosureLeft;//collapsed, RTL
}
@@ -815,7 +815,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
aTrackInfo.bounds.origin.y -= 2; // FIXME: magic for shadow
aTrackInfo.bounds.size.width -= 2; // FIXME: magic for shadow
aTrackInfo.attributes = kThemeTrackHorizontal;
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
aTrackInfo.attributes |= kThemeTrackRightToLeft;
aTrackInfo.enableState = getTrackState( nState );
// the intro bitmap never gets key anyway; we want to draw that enabled
@@ -972,7 +972,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
//support for RTL
//see issue 79748
- if( Application::GetSettings().GetLayoutRTL() ) {
+ if( AllSettings::GetLayoutRTL() ) {
if( aTabItemDrawInfo.position == kHIThemeTabPositionFirst )
aTabItemDrawInfo.position = kHIThemeTabPositionLast;
else if( aTabItemDrawInfo.position == kHIThemeTabPositionLast )
@@ -1105,7 +1105,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
HIRect buttonRc = ImplGetHIRectFromRectangle(aSpinRect);
// FIXME: without this fuzz factor there is some unwanted clipping
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
buttonRc.origin.x -= FOCUS_RING_WIDTH - CLIP_FUZZ;
else
buttonRc.origin.x += FOCUS_RING_WIDTH + CLIP_FUZZ;
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index d15508f..54faf89 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -778,7 +778,7 @@ void CanvasBitmapTest::runTest()
CPPUNIT_ASSERT_MESSAGE("(9,2) incorrect content",
pBmpAcc->GetPixel(2,9) == BitmapColor(9));
- aBmp.GetBitmap().ReleaseAccess(pBmpAcc);
+ Bitmap::ReleaseAccess(pBmpAcc);
}
xTestBmp.set( new TestBitmap( geometry::IntegerSize2D(10,10), false ));
@@ -815,7 +815,7 @@ void CanvasBitmapTest::runTest()
pAlphaAcc->GetPixel(2,9) == BitmapColor(253));
aBmp.GetAlpha().ReleaseAccess(pAlphaAcc);
- aBmp.GetBitmap().ReleaseAccess(pBmpAcc);
+ Bitmap::ReleaseAccess(pBmpAcc);
}
}
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index b202d64..7d625df 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2821,12 +2821,12 @@ namespace
}
}
-bool AllSettings::GetLayoutRTL() const
+bool AllSettings::GetLayoutRTL()
{
return GetConfigLayoutRTL(false);
}
-bool AllSettings::GetMathLayoutRTL() const
+bool AllSettings::GetMathLayoutRTL()
{
return GetConfigLayoutRTL(true);
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f704e66..a35327a 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1034,7 +1034,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd )
if( !aClipRgn.IsNull() )
{
// transform clipping region to border window's coordinate system
- if( IsRTLEnabled() != pBorder->IsRTLEnabled() && Application::GetSettings().GetLayoutRTL() )
+ if( IsRTLEnabled() != pBorder->IsRTLEnabled() && AllSettings::GetLayoutRTL() )
{
// need to mirror in case border is not RTL but edit is (or vice versa)
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index a4ffdf8..a78c561 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -43,7 +43,7 @@ void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
nStyle |= WB_TABSTOP;
PushButton::ImplInit( pParent, nStyle );
- EnableRTL( Application::GetSettings().GetLayoutRTL() );
+ EnableRTL( AllSettings::GetLayoutRTL() );
}
void MenuButton::ExecuteMenu()
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index e176657..dd46cda 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -334,7 +334,7 @@ IMPL_LINK( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar )
void ImpVclMEdit::SetAlign( WinBits nWinStyle )
{
- bool bRTL = Application::GetSettings().GetLayoutRTL();
+ bool bRTL = AllSettings::GetLayoutRTL();
mpTextWindow->GetTextEngine()->SetRightToLeft( bRTL );
if ( nWinStyle & WB_CENTER )
@@ -423,7 +423,7 @@ void ImpVclMEdit::Resize()
Point aTextWindowPos( maTextWindowOffset );
if ( mpVScrollBar )
{
- if( Application::GetSettings().GetLayoutRTL() )
+ if( AllSettings::GetLayoutRTL() )
{
mpVScrollBar->setPosSizePixel( 0, 0, nSBWidth, aSz.Height() );
aTextWindowPos.X() += nSBWidth;
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 0b14c77..3526a0b 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -69,10 +69,10 @@ GIFReader::~GIFReader()
aImGraphic.SetContext( NULL );
if( pAcc1 )
- aBmp1.ReleaseAccess( pAcc1 );
+ Bitmap::ReleaseAccess( pAcc1 );
if( pAcc8 )
- aBmp8.ReleaseAccess( pAcc8 );
+ Bitmap::ReleaseAccess( pAcc8 );
delete[] pSrcBuf;
}
@@ -544,12 +544,12 @@ void GIFReader::CreateNewBitmaps()
{
AnimationBitmap aAnimBmp;
- aBmp8.ReleaseAccess( pAcc8 );
+ Bitmap::ReleaseAccess( pAcc8 );
pAcc8 = NULL;
if( bGCTransparent )
{
- aBmp1.ReleaseAccess( pAcc1 );
+ Bitmap::ReleaseAccess( pAcc1 );
pAcc1 = NULL;
aAnimBmp.aBmpEx = BitmapEx( aBmp8, aBmp1 );
}
@@ -585,11 +585,11 @@ const Graphic& GIFReader::GetIntermediateGraphic()
{
Bitmap aBmp;
- aBmp8.ReleaseAccess( pAcc8 );
+ Bitmap::ReleaseAccess( pAcc8 );
if ( bGCTransparent )
{
- aBmp1.ReleaseAccess( pAcc1 );
+ Bitmap::ReleaseAccess( pAcc1 );
aImGraphic = BitmapEx( aBmp8, aBmp1 );
pAcc1 = aBmp1.AcquireWriteAccess();
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index ff1eed9..6bf877a 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -40,7 +40,7 @@ XBMReader::~XBMReader()
delete[] pHexTable;
if( pAcc1 )
- aBmp1.ReleaseAccess( pAcc1 );
+ Bitmap::ReleaseAccess( pAcc1 );
}
void XBMReader::InitTable()
@@ -319,7 +319,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
{
Bitmap aBlackBmp( Size( pAcc1->Width(), pAcc1->Height() ), 1 );
- aBmp1.ReleaseAccess( pAcc1 ), pAcc1 = NULL;
+ Bitmap::ReleaseAccess( pAcc1 ), pAcc1 = NULL;
aBlackBmp.Erase( Color( COL_BLACK ) );
rGraphic = BitmapEx( aBlackBmp, aBmp1 );
eReadState = XBMREAD_OK;
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index fc378c2..05d4d0f 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -54,7 +54,7 @@ XPMReader::XPMReader(SvStream& rStm)
XPMReader::~XPMReader()
{
if( mpAcc )
- maBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
ReadState XPMReader::ReadXPM( Graphic& rGraphic )
@@ -181,21 +181,21 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
{
if ( mpMaskAcc )
{
- maMaskBmp.ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
- maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+ Bitmap::ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
+ Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
rGraphic = Graphic( BitmapEx( maBmp, maMaskBmp ) );
}
else
{
- maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+ Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
rGraphic = maBmp;
}
eReadState = XPMREAD_OK;
}
else
{
- if ( mpMaskAcc ) maMaskBmp.ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
- if ( mpAcc ) maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+ if ( mpMaskAcc ) Bitmap::ReleaseAccess ( mpMaskAcc), mpMaskAcc = NULL;
+ if ( mpAcc ) Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
eReadState = XPMREAD_ERROR;
}
}
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 03c3ce9..5785224 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -196,10 +196,10 @@ JPEGReader::~JPEGReader()
delete[] mpBuffer;
if( mpAcc )
- maBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
if( mpAcc1 )
- maBmp1.ReleaseAccess( mpAcc1 );
+ Bitmap::ReleaseAccess( mpAcc1 );
}
unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
@@ -217,7 +217,7 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
if( mpAcc )
{
- maBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
maBmp = Bitmap();
mpAcc = NULL;
}
@@ -295,7 +295,7 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
// clean up, if no Bitmap buffer can be provided.
if ( !pBmpBuf )
{
- maBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
maBmp = Bitmap();
mpAcc = NULL;
}
@@ -388,7 +388,7 @@ Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLine
{
if( mpAcc1 )
{
- maBmp1.ReleaseAccess( mpAcc1 );
+ Bitmap::ReleaseAccess( mpAcc1 );
}
maBmp1 = Bitmap( rBitmap.GetSizePixel(), 1 );
@@ -408,7 +408,7 @@ Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLine
mpAcc1->FillRect( Rectangle( Point( 0, mnLastLines ), Size( mpAcc1->Width(), nNewLines ) ) );
}
- maBmp1.ReleaseAccess( mpAcc1 );
+ Bitmap::ReleaseAccess( mpAcc1 );
aGraphic = BitmapEx( rBitmap, maBmp1 );
mpAcc1 = maBmp1.AcquireWriteAccess();
}
@@ -465,7 +465,7 @@ ReadState JPEGReader::Read( Graphic& rGraphic )
mpBuffer = NULL;
}
- maBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
mpAcc = NULL;
if( mrStream.GetError() == ERRCODE_IO_PENDING )
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 45fd8ce..fe03540 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -236,7 +236,7 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
delete[] mpBuffer;
mpBuffer = NULL;
- aGraphicBmp.ReleaseAccess( mpReadAccess );
+ Bitmap::ReleaseAccess( mpReadAccess );
mpReadAccess = NULL;
}
if ( mxStatusIndicator.is() )
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 21f3516..c7d1315 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -667,7 +667,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
}
}
}
- aBmp.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
if ( nSye && nSxe &&
( ( nSx + nSxe ) <= aBmp.GetSizePixel().Width() ) &&
( ( nSy + nSye <= aBmp.GetSizePixel().Height() ) ) )
@@ -759,7 +759,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
nCount = pBmp->Height() * pBmp->Width();
if ( !nCount )
nCount++;
- aBmp.ReleaseAccess( pBmp );
+ Bitmap::ReleaseAccess( pBmp );
}
Color aColor( (sal_uInt8)( nRed / nCount ), (sal_uInt8)( nGreen / nCount ), (sal_uInt8)( nBlue / nCount ) );
pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( aColor, false ) );
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 3df5896..b5209f8 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -280,7 +280,7 @@ bool Bitmap::HasGreyPalette() const
if( pIAcc )
{
bRet = pIAcc->HasPalette() && pIAcc->GetPalette().IsGreyPalette();
- const_cast<Bitmap*>(this)->ReleaseAccess( pIAcc );
+ ReleaseAccess( pIAcc );
}
return bRet;
@@ -334,7 +334,7 @@ sal_uLong Bitmap::GetChecksum() const
mpImpBmp->ImplSetChecksum( nRet = nCrc );
}
- if (pRAcc) const_cast<Bitmap*>(this)->ReleaseAccess( pRAcc );
+ if (pRAcc) ReleaseAccess( pRAcc );
}
}
@@ -702,7 +702,7 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor )
pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nOtherY--, nOtherX ) );
}
- Bitmap::ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
}
aRotatedBmp = aNewBmp;
@@ -772,7 +772,7 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor )
}
}
- Bitmap::ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
}
aRotatedBmp = aNewBmp;
@@ -818,7 +818,7 @@ bool Bitmap::Crop( const Rectangle& rRectPixel )
for( long nX = 0, nX2 = nOldX; nX < nNewWidth; nX++, nX2++ )
pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nY2, nX2 ) );
- Bitmap::ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -899,7 +899,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst,
}
if( pSrcAcc )
- Bitmap::ReleaseAccess( pSrcAcc );
+ ReleaseAccess( pSrcAcc );
if( pDstAcc )
ReleaseAccess( pDstAcc );
@@ -953,7 +953,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst,
bRet = ( nWidth > 0L ) && ( nHeight > 0L );
}
- Bitmap::ReleaseAccess( pReadAcc );
+ ReleaseAccess( pReadAcc );
}
}
}
@@ -1060,7 +1060,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const Rectangle& rRectDst, const Rectangl
bRet = ( nWidth > 0L ) && ( nHeight > 0L );
}
- Bitmap::ReleaseAccess( pReadAcc );
+ ReleaseAccess( pReadAcc );
}
}
}
@@ -1168,7 +1168,7 @@ bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor )
for( nX = 0; nX < nNewWidth; nX++ )
pWriteAcc->SetPixel( nY, nX, aColor );
- Bitmap::ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -1354,11 +1354,11 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
}
}
- const_cast<Bitmap*>(this)->ReleaseAccess( pReadAcc );
+ ReleaseAccess( pReadAcc );
bRet = true;
}
- aNewBmp.ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
}
if( bRet )
@@ -1469,7 +1469,7 @@ vcl::Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect )
//aRegion.ImplEndAddRect();
//aRegion.SetRegionRectangles(aRectangles);
- const_cast<Bitmap*>(this)->ReleaseAccess( pReadAcc );
+ ReleaseAccess( pReadAcc );
}
else
aRegion = aRect;
@@ -1543,7 +1543,7 @@ bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor )
bRet = true;
}
- Bitmap::ReleaseAccess( pMaskAcc );
+ ReleaseAccess( pMaskAcc );
ReleaseAccess( pAcc );
return bRet;
@@ -1576,8 +1576,8 @@ bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor )
}
ReleaseAccess( pAcc );
- ( (AlphaMask&) rAlpha ).ReleaseAccess( pAlphaAcc );
- Bitmap::ReleaseAccess( pNewAcc );
+ ReleaseAccess( pAlphaAcc );
+ ReleaseAccess( pNewAcc );
if( bRet )
{
@@ -1921,7 +1921,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine )
bRet = true;
}
- Bitmap::ReleaseAccess( pMaskAcc );
+ ReleaseAccess( pMaskAcc );
ReleaseAccess( pAcc );
return bRet;
@@ -1954,7 +1954,7 @@ bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor )
bRet = true;
}
- const_cast<AlphaMask&>(rAlpha).ReleaseAccess( pAlphaAcc );
+ ReleaseAccess( pAlphaAcc );
ReleaseAccess( pAcc );
return bRet;
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 60ed14d..d3d6db4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -380,7 +380,7 @@ bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold )
}
}
- aNewBmp.ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -455,7 +455,7 @@ bool Bitmap::ImplMakeMonoDither()
}
}
- aNewBmp.ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -561,7 +561,7 @@ bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys )
pWriteAcc->SetPixelIndex( nY, nX, (pReadAcc->GetPixel( nY, nX ) ).GetLuminance() >> nShift );
}
- aNewBmp.ReleaseAccess( pWriteAcc );
+ ReleaseAccess( pWriteAcc );
bRet = true;
}
@@ -816,7 +816,7 @@ bool Bitmap::ImplConvertGhosted()
if( pW )
{
pW->CopyBuffer( *pR );
- aNewBmp.ReleaseAccess( pW );
+ ReleaseAccess( pW );
bRet = true;
}
}
@@ -842,7 +842,7 @@ bool Bitmap::ImplConvertGhosted()
}
}
- aNewBmp.ReleaseAccess( pW );
+ ReleaseAccess( pW );
bRet = true;
}
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list