vcl/Library_vcl.mk | 1 + vcl/source/window/globalization.cxx | 35 +++++++++++++++++++++++++++++++++++ vcl/source/window/window.cxx | 12 ------------ 3 files changed, 36 insertions(+), 12 deletions(-)
New commits: commit bb2f6e6c5130d8b6ad702b00c1aa4f8d559056a3 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Tue May 20 02:54:11 2014 +1000 vcl: move globalization functions from window.cxx to globalization.cxx Change-Id: I8f617f2c480f8c5c7f5230cc6d6a6e82d8750857 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index aee5c13..5325505 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -110,6 +110,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/window/clipping \ vcl/source/window/stacking \ vcl/source/window/debug \ + vcl/source/window/globalization \ vcl/source/window/btndlg \ vcl/source/window/builder \ vcl/source/window/cmdevt \ diff --git a/vcl/source/window/globalization.cxx b/vcl/source/window/globalization.cxx new file mode 100644 index 0000000..2165897 --- /dev/null +++ b/vcl/source/window/globalization.cxx @@ -0,0 +1,35 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <vcl/window.hxx> +#include <vcl/outdev.hxx> + +void Window::EnableRTL ( bool bEnable ) +{ + StateChanged( STATE_CHANGE_MIRRORING ); + OutputDevice::EnableRTL(bEnable); +} + +bool Window::HasMirroredGraphics() const +{ + const OutputDevice* pOutDev = GetOutDev(); + return pOutDev->OutputDevice::HasMirroredGraphics(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index ce8f7df..b3dc24e 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -397,12 +397,6 @@ void Window::ReleaseGraphics( bool bRelease ) mpNextGraphics = NULL; } -void Window::EnableRTL ( bool bEnable ) -{ - StateChanged( STATE_CHANGE_MIRRORING ); - OutputDevice::EnableRTL(bEnable); -} - void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags ) { if (aPosAry.mnSrcWidth == 0 || aPosAry.mnSrcHeight == 0 || aPosAry.mnDestWidth == 0 || aPosAry.mnDestHeight == 0) @@ -429,12 +423,6 @@ void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags ) OutputDevice::CopyDeviceArea(aPosAry, nFlags); } -bool Window::HasMirroredGraphics() const -{ - const OutputDevice* pOutDev = GetOutDev(); - return pOutDev->OutputDevice::HasMirroredGraphics(); -} - void Window::ImplInitAppFontData( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits