diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-11-25 14:46:04 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-11-25 14:46:04 +0100 |
| commit | 068d7541e2cba4a40f71ec830e39c3901966ce1c (patch) | |
| tree | 58d8141690fb663d26264eb963e1174d38c53003 /reportdesign | |
| parent | 4ae5573a0f94cc859ba2c30ac71bcd2ff8677f1f (diff) | |
undoapi: renamed Undo.* to RptUndo.*, to not confuse a certain IDE with different same-named files in the source tree ...
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/RptUndo.hxx (renamed from reportdesign/source/ui/inc/Undo.hxx) | 0 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/RptUndo.cxx (renamed from reportdesign/source/ui/misc/Undo.cxx) | 11 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/makefile.mk | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index af61f3b6d514..506fa4abd90b 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -31,7 +31,7 @@ #include "uistrings.hrc" #include "ReportController.hxx" #include "UITools.hxx" -#include "Undo.hxx" +#include "RptUndo.hxx" #include "reportformula.hxx" #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/report/XReportDefinition.hpp> diff --git a/reportdesign/source/ui/inc/Undo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 479872b06573..479872b06573 100644 --- a/reportdesign/source/ui/inc/Undo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index d944dc2aee20..312946139a0a 100644 --- a/reportdesign/source/ui/misc/Undo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -26,21 +26,16 @@ ************************************************************************/ #include "precompiled_reportdesign.hxx" -#include "Undo.hxx" -#ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC +#include "RptUndo.hxx" #include "uistrings.hrc" -#endif -#ifndef _RPTUI_SLOTID_HRC_ #include "rptui_slotid.hrc" -#endif -#ifndef RPTUI_TOOLS_HXX #include "UITools.hxx" -#endif +#include "UndoEnv.hxx" + #include <dbaccess/IController.hxx> #include <com/sun/star/report/XSection.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include "UndoEnv.hxx" #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <svx/unoshape.hxx> diff --git a/reportdesign/source/ui/misc/makefile.mk b/reportdesign/source/ui/misc/makefile.mk index b12bafdc7760..494b68023d62 100644 --- a/reportdesign/source/ui/misc/makefile.mk +++ b/reportdesign/source/ui/misc/makefile.mk @@ -44,7 +44,7 @@ VISIBILITY_HIDDEN=TRUE # ... object files ............................ EXCEPTIONSFILES= \ - $(SLO)$/Undo.obj \ + $(SLO)$/RptUndo.obj \ $(SLO)$/ColorListener.obj \ $(SLO)$/UITools.obj \ $(SLO)$/rptuiservices.obj \ diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 9b7dd3374b44..7542517f11c1 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -127,7 +127,7 @@ #include "DesignView.hxx" #include "ModuleHelper.hxx" #include "RptObject.hxx" -#include "Undo.hxx" +#include "RptUndo.hxx" #include "uistrings.hrc" #include "RptDef.hxx" #include "ReportSection.hxx" |