diff options
Diffstat (limited to 'sd/source/ui/app/sdmod2.cxx')
| -rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 0a4eaf0bbebe..9aa36ddd3f82 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdmod2.cxx,v $ - * $Revision: 1.55 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,8 +27,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <sfx2/printer.hxx> #include <svl/inethist.hxx> #include <svl/poolitem.hxx> @@ -43,9 +40,9 @@ #include <sfx2/docfile.hxx> #include <sfx2/request.hxx> -#include <svx/svdfield.hxx> -#include <svx/editstat.hxx> -#include <svx/editeng.hxx> +#include <editeng/measfld.hxx> +#include <editeng/editstat.hxx> +#include <editeng/editeng.hxx> #include <svx/dialogs.hrc> #include <svx/svdotext.hxx> @@ -490,7 +487,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) nMetric = (FieldUnit)pOptions->GetMetric(); if( nMetric == (FieldUnit)0xffff ) - nMetric = GetModuleFieldUnit(); + nMetric = GetFieldUnit(); pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (UINT16)nMetric ) ); |