diff options
| -rw-r--r-- | include/sfx2/sidebar/TabBar.hxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 1738df1e2bfe..c3b429613b80 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -24,7 +24,6 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/menu.hxx> -#include <vcl/window.hxx> #include <functional> diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index ecb113dadcfd..a4ceae554be5 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -46,7 +46,7 @@ #include <unotools/fltrcfg.hxx> #include <vcl/dibtools.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/window.hxx> +#include <vcl/outdev.hxx> #include <vcl/wmf.hxx> #include <comphelper/classids.hxx> #include <comphelper/documentinfo.hxx> @@ -1752,7 +1752,7 @@ SdrObjectUniquePtr XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, inserted into the draw page. */ sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT; MapUnit aUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xEmbObj->getMapUnit( nAspect ) ); - Size aSize( vcl::Window::LogicToLogic( rAnchorRect.GetSize(), MapMode( MapUnit::Map100thMM ), MapMode( aUnit ) ) ); + Size aSize( OutputDevice::LogicToLogic( rAnchorRect.GetSize(), MapMode( MapUnit::Map100thMM ), MapMode( aUnit ) ) ); css::awt::Size aAwtSize( aSize.Width(), aSize.Height() ); xEmbObj->setVisualAreaSize( nAspect, aAwtSize ); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index ebbbbca891c3..9aee4d0ecec6 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -324,11 +324,11 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* xObj->setVisualAreaSize( nAspect, aSz ); // re-convert aSize to 1/100th mm to avoid rounding errors in comparison below - aSize = vcl::Window::LogicToLogic( aTmp, + aSize = OutputDevice::LogicToLogic( aTmp, MapMode( aMapUnit ), aMap100 ); } else - aSize = vcl::Window::LogicToLogic( aSize, + aSize = OutputDevice::LogicToLogic( aSize, MapMode( aMapUnit ), aMap100 ); } @@ -506,7 +506,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawV } if (bSizeCh) { - aSize = vcl::Window::LogicToLogic( aSize, MapMode( MapUnit::Map100thMM ), MapMode( aMapUnit ) ); + aSize = OutputDevice::LogicToLogic( aSize, MapMode( MapUnit::Map100thMM ), MapMode( aMapUnit ) ); aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); xObj->setVisualAreaSize( nAspect, aSz ); diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index f5bec6a0867a..01434b40f141 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -605,7 +605,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { awt::Size aSz = xObj->getVisualAreaSize( nAspect ); - Size aNewSize = Window::LogicToLogic( Size( aSz.Width, aSz.Height ), + Size aNewSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), MapMode( aMapUnit ), MapMode( MapUnit::Map100thMM ) ); if ( aNewSize != aSize ) { |