Kaydet (Commit) 2cca46d5 authored tarafından Luboš Luňák's avatar Luboš Luňák

PCH for more libraries

Change-Id: I6f9a1969605e0016b11157ddb5754ac77fd3966b
üst 5e28f6e9
......@@ -131,10 +131,13 @@ function filter_ignore()
# - sores.hxx provides BMP_PLUGIN, which is redefined
# - some sources play ugly #define tricks with editeng/eeitemid.hxx
# - jerror.h and jpeglib.h are not self-contained
# - service1.hxx/service2.hxx are inside comments in frameworks/
grep -e '\.h[">]$' -e '\.hpp[">]$' -e '\.hdl[">]$' -e '\.hxx[">]$' -e '^[^\.]*>$' | \
grep -v -F -e '#include "gperffasttoken.hxx"' | \
grep -v -F -e '#include <svtools/sores.hxx>' | \
grep -v -F -e '#include <editeng/eeitemid.hxx>' | \
grep -v -F -e '#include <service1.hxx>' | \
grep -v -F -e '#include <service2.hxx>' | \
grep -v -F -e '#include "jerror.h"' | \
grep -v -F -e '#include "jpeglib.h"'
)
......
......@@ -15,6 +15,8 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
-I$(SRCDIR)/chart2/source/inc \
))
$(eval $(call gb_Library_set_precompiled_header,chartcontroller,$(SRCDIR)/chart2/inc/pch/precompiled_chartcontroller))
$(eval $(call gb_Library_use_external,chartcontroller,boost_headers))
$(eval $(call gb_Library_use_sdk_api,chartcontroller))
......
......@@ -22,6 +22,8 @@ $(eval $(call gb_Library_add_defs,chartcore,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
$(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
$(eval $(call gb_Library_use_external,chartcore,boost_headers))
$(eval $(call gb_Library_use_custom_headers,chartcore,\
......
/* -*- 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/.
*/
#include "precompiled_chartcontroller.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This diff is collapsed.
/* -*- 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/.
*/
#include "precompiled_chartcore.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This diff is collapsed.
......@@ -176,7 +176,7 @@ void ChartWindow::KeyInput( const KeyEvent& rKEvt )
Window::KeyInput( rKEvt );
}
uno::Reference< accessibility::XAccessible > ChartWindow::CreateAccessible()
uno::Reference< css::accessibility::XAccessible > ChartWindow::CreateAccessible()
{
if( m_pWindowController )
return m_pWindowController->CreateAccessible();
......
......@@ -23,7 +23,7 @@
#include <vector>
#include <algorithm>
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::std;
......@@ -36,8 +36,8 @@ namespace chart
double RelativeSizeHelper::calculate(
double fValue,
const Size & rOldReferenceSize,
const Size & rNewReferenceSize )
const awt::Size & rOldReferenceSize,
const awt::Size & rNewReferenceSize )
{
if( rOldReferenceSize.Width <= 0 ||
rOldReferenceSize.Height <= 0 )
......@@ -51,8 +51,8 @@ double RelativeSizeHelper::calculate(
void RelativeSizeHelper::adaptFontSizes(
const Reference< XPropertySet > & xTargetProperties,
const Size & rOldReferenceSize,
const Size & rNewReferenceSize )
const awt::Size & rOldReferenceSize,
const awt::Size & rNewReferenceSize )
{
if( ! xTargetProperties.is())
return;
......
......@@ -16,6 +16,8 @@ $(eval $(call gb_Library_set_include,cui,\
-I$(SRCDIR)/cui/source/inc \
))
$(eval $(call gb_Library_set_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precompiled_cui))
$(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
$(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
......
/* -*- 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/.
*/
#include "precompiled_cui.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This diff is collapsed.
......@@ -74,7 +74,7 @@ const sal_uInt16 COLORCOMP_KEY = 0x43;
static void RGBtoHSV( double dR, double dG, double dB, double& dH, double& dS, double& dV )
{
BColor result = tools::rgb2hsv( BColor( dR, dG, dB ) );
BColor result = basegfx::tools::rgb2hsv( BColor( dR, dG, dB ) );
dH = result.getX();
dS = result.getY();
......@@ -83,7 +83,7 @@ static void RGBtoHSV( double dR, double dG, double dB, double& dH, double& dS, d
static void HSVtoRGB(double dH, double dS, double dV, double& dR, double& dG, double& dB )
{
BColor result = tools::hsv2rgb( BColor( dH, dS, dV ) );
BColor result = basegfx::tools::hsv2rgb( BColor( dH, dS, dV ) );
dR = result.getRed();
dG = result.getGreen();
......
......@@ -20,6 +20,8 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#undef WB_LEFT
#undef WB_RIGHT
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
......
......@@ -1713,7 +1713,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
else
{
// color to use as background for an invalid pattern
#define INVALID_PATTERN_BACKGROUND_COLOR Color(0xff6563)
#define INVALID_PATTERN_BACKGROUND_COLOR ::Color(0xff6563)
#if 0
// color to use as foreground for an invalid pattern
#define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE)
......
......@@ -13,6 +13,8 @@ $(eval $(call gb_Library_add_defs,drawinglayer,\
-DDRAWINGLAYER_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_set_precompiled_header,drawinglayer,$(SRCDIR)/drawinglayer/inc/pch/precompiled_drawinglayer))
$(eval $(call gb_Library_set_componentfile,drawinglayer,drawinglayer/drawinglayer))
$(eval $(call gb_Library_use_sdk_api,drawinglayer))
......
/* -*- 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/.
*/
#include "precompiled_drawinglayer.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* -*- 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 has been autogenerated by update_pch.sh . It is possible to edit it
manually (such as when an include file has been moved/renamed/removed. All such
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
*/
#include "i18nlangtag/lang.h"
#include "sal/config.h"
#include "svl/ctloptions.hxx"
#include "vcl/svapp.hxx"
#include <algorithm>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/color/bcolormodifier.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b3dpoint.hxx>
#include <basegfx/polygon/b2dlinegeometry.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygonclipper.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dtrapezoid.hxx>
#include <basegfx/polygon/b3dpolygon.hxx>
#include <basegfx/polygon/b3dpolygontools.hxx>
#include <basegfx/polygon/b3dpolypolygon.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/range/b3drange.hxx>
#include <basegfx/raster/bpixelraster.hxx>
#include <basegfx/raster/bzpixelraster.hxx>
#include <basegfx/raster/rasterconvert3d.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/tools/gradienttools.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <boost/noncopyable.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/awt/XView.hpp>
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/geometry/AffineMatrix2D.hpp>
#include <com/sun/star/geometry/AffineMatrix3D.hpp>
#include <com/sun/star/geometry/RealRectangle2D.hpp>
#include <com/sun/star/geometry/RealRectangle3D.hpp>
#include <com/sun/star/graphic/XPrimitive2DRenderer.hpp>
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/CharType.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/scoped_disposing_ptr.hxx>
#include <comphelper/string.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cstdio>
#include <i18nlangtag/languagetag.hxx>
#include <iostream>
#include <libxml/xmlwriter.h>
#include <numeric>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
#include <svtools/borderhelper.hxx>
#include <svtools/grfmgr.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/formpdfexport.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/gen.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <uno/environment.h>
#include <vcl/animate.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphictools.hxx>
#include <vcl/hatch.hxx>
#include <vcl/lazydelete.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/metaact.hxx>
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwk,\
$$(INCLUDE) \
))
$(eval $(call gb_Library_set_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_fwk))
$(eval $(call gb_Library_use_external,fwk,boost_headers))
$(eval $(call gb_Library_use_custom_headers,fwk,\
......
/* -*- 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/.
*/
#include "precompiled_fwk.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This diff is collapsed.
......@@ -265,7 +265,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
{
sal_uInt16 nId = pMenu->GetItemId(nPos);
PopupMenu* pPopup = pMenu->GetPopupMenu(nId);
::PopupMenu* pPopup = pMenu->GetPopupMenu(nId);
if ( pPopup )
impl_setAccelerators( (Menu *)pPopup, aAccel );
else if ( nId && !pMenu->GetPopupMenu(nId))
......
......@@ -52,6 +52,8 @@ using namespace com::sun::star::container;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::ui;
#undef WINDOWSTATE_MASK_POS
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
......
......@@ -324,7 +324,7 @@ MenuToolbarController::~MenuToolbarController()
}
class Toolbarmenu : public PopupMenu
class Toolbarmenu : public ::PopupMenu
{
public:
Toolbarmenu();
......
......@@ -112,7 +112,7 @@ throw (::com::sun::star::uno::RuntimeException)
( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON ))
{
// create popup menu
PopupMenu aPopup;
::PopupMenu aPopup;
const sal_uInt32 nCount = m_aDropdownMenuList.size();
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
......
......@@ -1619,11 +1619,11 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar )
if ( m_bDisposed )
return;
PopupMenu *pMenu = pToolBar->GetMenu();
::PopupMenu *pMenu = pToolBar->GetMenu();
// remove config entries from menu, so we have a clean menu to start with
// remove submenu first
PopupMenu* pItemMenu = pMenu->GetPopupMenu( 1 );
::PopupMenu* pItemMenu = pMenu->GetPopupMenu( 1 );
if( pItemMenu )
{
pItemMenu->Clear();
......@@ -1692,12 +1692,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
return true;
}
PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
::PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
{
// update the list of hidden tool items first
pToolBar->UpdateCustomMenu();
PopupMenu *pMenu = pToolBar->GetMenu();
::PopupMenu *pMenu = pToolBar->GetMenu();
// remove all entries before inserting new ones
ImplClearPopupMenu( pToolBar );
// No config menu entries if command ".uno:ConfigureDialog" is not enabled
......@@ -1717,12 +1717,12 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
// popup menu for quick customization
sal_Bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
if ( m_pToolBar->IsCustomize() )
{
sal_uInt16 nPos( 0 );
PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
::PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
sal_Bool bIsFloating( sal_False );
......@@ -1794,7 +1794,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
if( aPopupMenu.GetPopupMenu( 1 ) )
{
// create an own submenu to avoid auto-delete when resource menu is deleted
PopupMenu *pItemMenu = new PopupMenu();
::PopupMenu *pItemMenu = new ::PopupMenu();
for( i=0; i< aPopupMenu.GetPopupMenu( 1 )->GetItemCount(); i++)
pItemMenu->CopyItem( *aPopupMenu.GetPopupMenu( 1 ), i, MENU_APPEND );
......@@ -1817,7 +1817,7 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt )
if ( pCmdEvt->GetCommand() != COMMAND_CONTEXTMENU )
return 0;
PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
if (pMenu)
{
// make sure all disabled entries will be shown
......
......@@ -19,6 +19,8 @@ $(eval $(call gb_Library_set_include,scfilt,\
$$(INCLUDE) \
))
$(eval $(call gb_Library_set_precompiled_header,scfilt,$(SRCDIR)/sc/inc/pch/precompiled_scfilt))
$(eval $(call gb_Library_use_sdk_api,scfilt))
$(eval $(call gb_Library_use_custom_headers,scfilt,\
......
......@@ -17,6 +17,8 @@ $(eval $(call gb_Library_set_include,vbaobj,\
$$(INCLUDE) \
))
$(eval $(call gb_Library_set_precompiled_header,vbaobj,$(SRCDIR)/sc/inc/pch/precompiled_vbaobj))
$(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj))
$(eval $(call gb_Library_use_external,vbaobj,boost_headers))
......
/* -*- 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/.
*/
#include "precompiled_scfilt.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This diff is collapsed.
/* -*- 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/.
*/
#include "precompiled_vbaobj.hxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
This diff is collapsed.
......@@ -40,8 +40,6 @@
using ::com::sun::star::text::XText;
using ::com::sun::star::text::XTextRange;
using ::com::sun::star::awt::Size;
using ::com::sun::star::awt::Point;
namespace oox {
namespace xls {
......@@ -175,8 +173,8 @@ void Comment::finalizeImport()
aCommentPr.setProperty( PROP_TextVerticalAdjust, lcl_ToVertAlign( maModel.mnTVA ) );
if( maModel.maAnchor.Width > 0 && maModel.maAnchor.Height > 0 )
{
xAnnoShape->setPosition( Point( maModel.maAnchor.X, maModel.maAnchor.Y ) );
xAnnoShape->setSize( Size( maModel.maAnchor.Width, maModel.maAnchor.Height ) );
xAnnoShape->setPosition( css::awt::Point( maModel.maAnchor.X, maModel.maAnchor.Y ) );
xAnnoShape->setSize( css::awt::Size( maModel.maAnchor.Width, maModel.maAnchor.Height ) );
}
// convert shape formatting and visibility
......
......@@ -31,7 +31,6 @@ namespace xls {
// ============================================================================
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::table;
using namespace ::oox::drawingml;
......@@ -181,7 +180,7 @@ void ShapeAnchor::importVmlAnchor( const OUString& rAnchor )
}
}
EmuRectangle ShapeAnchor::calcAnchorRectEmu( const Size& rPageSizeHmm ) const
EmuRectangle ShapeAnchor::calcAnchorRectEmu( const css::awt::Size& rPageSizeHmm ) const
{
AddressConverter& rAddrConv = getAddressConverter();
EmuSize aPageSize( lclHmmToEmu( rPageSizeHmm.Width ), lclHmmToEmu( rPageSizeHmm.Height ) );
......@@ -259,16 +258,16 @@ EmuRectangle ShapeAnchor::calcAnchorRectEmu( const Size& rPageSizeHmm ) const
return aAnchorRect;
}
Rectangle ShapeAnchor::calcAnchorRectHmm( const Size& rPageSizeHmm ) const
css::awt::Rectangle ShapeAnchor::calcAnchorRectHmm( const css::awt::Size& rPageSizeHmm ) const
{
EmuRectangle aAnchorRect = calcAnchorRectEmu( rPageSizeHmm );
return Rectangle( lclEmuToHmm( aAnchorRect.X ), lclEmuToHmm( aAnchorRect.Y ), lclEmuToHmm( aAnchorRect.Width ), lclEmuToHmm( aAnchorRect.Height ) );
return css::awt::Rectangle( lclEmuToHmm( aAnchorRect.X ), lclEmuToHmm( aAnchorRect.Y ), lclEmuToHmm( aAnchorRect.Width ), lclEmuToHmm( aAnchorRect.Height ) );
}
EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const
{
// calculate position of top-left edge of the cell
Point aPoint = getCellPosition( rModel.mnCol, rModel.mnRow );
css::awt::Point aPoint = getCellPosition( rModel.mnCol, rModel.mnRow );
EmuPoint aEmuPoint( lclHmmToEmu( aPoint.X ), lclHmmToEmu( aPoint.Y ) );
// add the offset inside the cell
......@@ -289,7 +288,7 @@ EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const
case CELLANCHOR_COLROW:
{
Size aCellSize = getCellSize( rModel.mnCol, rModel.mnRow );
css::awt::Size aCellSize = getCellSize( rModel.mnCol, rModel.mnRow );
EmuSize aEmuSize( lclHmmToEmu( aCellSize.Width ), lclHmmToEmu( aCellSize.Height ) );
// X offset is given in 1/1024 of column width
aEmuPoint.X += static_cast< sal_Int64 >( aEmuSize.Width * getLimitedValue< double >( static_cast< double >( rModel.mnColOffset ) / 1024.0, 0.0, 1.0 ) + 0.5 );
......
......@@ -209,7 +209,7 @@ BiffDrawingObjectContainer::BiffDrawingObjectContainer()
{
}
void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, const Reference< XShapes >& rxShapes, const css::awt::Rectangle* pParentRect ) const
{
maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert, ::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect );
}
......@@ -237,14 +237,14 @@ BiffDrawingObjectBase::~BiffDrawingObjectBase()
}
Reference< XShape > BiffDrawingObjectBase::convertAndInsert( BiffDrawingBase& rDrawing,
const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
const Reference< XShapes >& rxShapes, const css::awt::Rectangle* pParentRect ) const
{
Reference< XShape > xShape;
if( rxShapes.is() && mbProcessShape && !mbHidden ) // TODO: support for hidden objects?
{
// base class 'ShapeAnchor' calculates the shape rectangle in 1/100 mm
// in BIFF3-BIFF5, all shapes have absolute anchor (also children of group shapes)
Rectangle aShapeRect = maAnchor.calcAnchorRectHmm( getDrawPageSize() );
css::awt::Rectangle aShapeRect = maAnchor.calcAnchorRectHmm( getDrawPageSize() );
// convert the shape, if the calculated rectangle is not empty
bool bHasWidth = aShapeRect.Width > 0;
......@@ -495,7 +495,7 @@ BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) :
{
}
void BiffSheetDrawing::notifyShapeInserted( const Reference< XShape >& /*rxShape*/, const Rectangle& rShapeRect )
void BiffSheetDrawing::notifyShapeInserted( const Reference< XShape >& /*rxShape*/, const css::awt::Rectangle& rShapeRect )
{
// collect all shape positions in the WorksheetHelper base class
extendShapeBoundingBox( rShapeRect );
......
......@@ -145,7 +145,7 @@ const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH = 0x0020;
1900-Jan-00. Nothing has to be done when the workbook is stored in 1904
date mode (dates before 1904-Jan-01 will not occur in this case).
*/
void lclAdjustBinDateTime( DateTime& orDateTime )
void lclAdjustBinDateTime( css::util::DateTime& orDateTime )
{
if( (orDateTime.Year == 1900) && (orDateTime.Month <= 2) )
{
......@@ -182,7 +182,7 @@ void PivotCacheItem::readNumeric( const AttributeList& rAttribs )
void PivotCacheItem::readDate( const AttributeList& rAttribs )
{
maValue <<= rAttribs.getDateTime( XML_v, DateTime() );
maValue <<= rAttribs.getDateTime( XML_v, css::util::DateTime() );
mnType = XML_d;
}
......@@ -218,7 +218,7 @@ void PivotCacheItem::readDouble( SequenceInputStream& rStrm )
void PivotCacheItem::readDate( SequenceInputStream& rStrm )
{
DateTime aDateTime;
css::util::DateTime aDateTime;
aDateTime.Year = rStrm.readuInt16();
aDateTime.Month = rStrm.readuInt16();
aDateTime.Day = rStrm.readuInt8();
......@@ -268,7 +268,7 @@ void PivotCacheItem::readInteger( BiffInputStream& rStrm )
void PivotCacheItem::readDate( BiffInputStream& rStrm )
{
DateTime aDateTime;
css::util::DateTime aDateTime;
aDateTime.Year = rStrm.readuInt16();
aDateTime.Month = rStrm.readuInt16();
aDateTime.Day = rStrm.readuInt8();
......@@ -541,8 +541,8 @@ void PivotCacheField::importFieldGroup( const AttributeList& rAttribs )
void PivotCacheField::importRangePr( const AttributeList& rAttribs )
{
maFieldGroupModel.maStartDate = rAttribs.getDateTime( XML_startDate, DateTime() );
maFieldGroupModel.maEndDate = rAttribs.getDateTime( XML_endDate, DateTime() );
maFieldGroupModel.maStartDate = rAttribs.getDateTime( XML_startDate, css::util::DateTime() );
maFieldGroupModel.maEndDate = rAttribs.getDateTime( XML_endDate, css::util::DateTime() );
maFieldGroupModel.mfStartValue = rAttribs.getDouble( XML_startNum, 0.0 );
maFieldGroupModel.mfEndValue = rAttribs.getDouble( XML_endNum, 0.0 );
maFieldGroupModel.mfInterval = rAttribs.getDouble( XML_groupInterval, 1.0 );
......@@ -723,8 +723,8 @@ void PivotCacheField::importPCDFRangePr( BiffInputStream& rStrm )
OSL_ENSURE( bHasTypes, "PivotCacheField::importPCDFRangePr - wrong data types in grouping items" );
if( bHasTypes )
{
maFieldGroupModel.maStartDate = pStartValue->getValue().get< DateTime >();
maFieldGroupModel.maEndDate = pEndValue->getValue().get< DateTime >();
maFieldGroupModel.maStartDate = pStartValue->getValue().get< css::util::DateTime >();
maFieldGroupModel.maEndDate = pEndValue->getValue().get< css::util::DateTime >();
maFieldGroupModel.mfInterval = pInterval->getValue().get< sal_Int16 >();
}
}
......@@ -1023,7 +1023,7 @@ void PivotCacheField::writeItemToSourceDataCell( WorksheetHelper& rSheetHelper,
case XML_s: rSheetData.setStringCell( aModel, rItem.getValue().get< OUString >() ); break;
case XML_n: rSheetData.setValueCell( aModel, rItem.getValue().get< double >() ); break;
case XML_i: rSheetData.setValueCell( aModel, rItem.getValue().get< sal_Int16 >() ); break;
case XML_d: rSheetData.setDateTimeCell( aModel, rItem.getValue().get< DateTime >() ); break;
case XML_d: rSheetData.setDateTimeCell( aModel, rItem.getValue().get< css::util::DateTime >() ); break;
case XML_b: rSheetData.setBooleanCell( aModel, rItem.getValue().get< bool >() ); break;
case XML_e: rSheetData.setErrorCell( aModel, static_cast< sal_uInt8 >( rItem.getValue().get< sal_Int32 >() ) ); break;
default: OSL_FAIL( "PivotCacheField::writeItemToSourceDataCell - unexpected item data type" );
......
......@@ -67,7 +67,7 @@ void lclSkipYearBlock( sal_Int32& ornDays, sal_Int16& ornYear, sal_Int32 nDaysIn
/** Returns the number of days before the passed date, starting from the null
date 0000-Jan-01, using standard leap year conventions. */
sal_Int32 lclGetDays( const Date& rDate )
sal_Int32 lclGetDays( const css::util::Date& rDate )
{
// number of days in all full years before passed date including all leap days
sal_Int32 nDays = rDate.Year * 365 + ((rDate.Year + 3) / 4) - ((rDate.Year + 99) / 100) + ((rDate.Year + 399) / 400);
......@@ -98,7 +98,7 @@ sal_Int32 lclGetDays( const Date& rDate )
UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) :
WorkbookHelper( rHelper ),
maCoeffs( UNIT_ENUM_SIZE, 1.0 ),
mnNullDate( lclGetDays( Date( 30, 12, 1899 ) ) )
mnNullDate( lclGetDays( css::util::Date( 30, 12, 1899 ) ) )
{
// initialize constant and default coefficients
const DeviceInfo& rDeviceInfo = getBaseFilter().getGraphicHelper().getDeviceInfo();
......@@ -157,7 +157,7 @@ void UnitConverter::finalizeImport()
}
}
void UnitConverter::finalizeNullDate( const Date& rNullDate )
void UnitConverter::finalizeNullDate( const css::util::Date& rNullDate )
{
// convert the nulldate to number of days since 0000-Jan-01
mnNullDate = lclGetDays( rNullDate );
......@@ -180,17 +180,17 @@ double UnitConverter::scaleFromMm100( sal_Int32 nMm100, Unit eUnit ) const
return static_cast< double >( nMm100 ) / getCoefficient( eUnit );
}
double UnitConverter::calcSerialFromDateTime( const DateTime& rDateTime ) const
double UnitConverter::calcSerialFromDateTime( const css::util::DateTime& rDateTime ) const
{