summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui/report
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:03:39 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:03:39 +0200
commit53aa87381a4df49d2d2c34328dc61716b4261ec7 (patch)
tree960b32cda2755f988d0d34e568f1019ad2bce0d2 /reportdesign/source/ui/report
parent2cfb9101ab66d1521faa19f4f7e7174aea66a972 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 38f9e030925fc02a8e00bdd5985d4375439e199c (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:02 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
Notes
Notes: split repo tag: base_libreoffice-3.3.3.1 split repo tag: base_libreoffice-3.3.4.1
Diffstat (limited to 'reportdesign/source/ui/report')
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx16
-rw-r--r--reportdesign/source/ui/report/EndMarker.cxx8
-rw-r--r--reportdesign/source/ui/report/FixedTextColor.cxx40
-rw-r--r--reportdesign/source/ui/report/FormattedFieldBeautifier.cxx18
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx560
-rw-r--r--reportdesign/source/ui/report/ReportControllerObserver.cxx46
-rw-r--r--reportdesign/source/ui/report/ReportRuler.cxx6
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx48
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx66
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx38
-rw-r--r--reportdesign/source/ui/report/SectionView.cxx12
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx36
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx26
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx150
-rw-r--r--reportdesign/source/ui/report/dlgedclip.cxx4
-rw-r--r--reportdesign/source/ui/report/dlgedfac.cxx10
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx258
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx24
-rw-r--r--reportdesign/source/ui/report/report.src40
19 files changed, 703 insertions, 703 deletions
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 3e97c4e0f002..4af7f7025345 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@ using namespace lang;
using namespace beans;
using namespace container;
-#define LINE_SIZE 50
+#define LINE_SIZE 50
#define START_SIZE_TASKPANE 30
#define COLSET_ID 1
#define REPORT_ID 2
@@ -96,7 +96,7 @@ class OwnSplitWindow : public SplitWindow
public:
OwnSplitWindow(Window* pParent) : SplitWindow(pParent,WB_DIALOGCONTROL){SetBackground( );}
- virtual void Split()
+ virtual void Split()
{
SplitWindow::Split();
setItemSizes();
@@ -104,7 +104,7 @@ public:
void setItemSizes()
{
const long nOutWidth = GetOutputSizePixel().Width();
- long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth();
+ long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth();
nTaskPaneMinSplitSize = static_cast<long>(nTaskPaneMinSplitSize*100/nOutWidth);
if ( !nTaskPaneMinSplitSize )
nTaskPaneMinSplitSize = START_SIZE_TASKPANE;
@@ -114,7 +114,7 @@ public:
long nReportSize = GetItemSize( REPORT_ID );
long nTaskPaneSize = GetItemSize( TASKPANE_ID );
- BOOL bMod = FALSE;
+ BOOL bMod = FALSE;
if( nReportSize < nReportMinSplitSize )
{
nReportSize = nReportMinSplitSize;
@@ -157,7 +157,7 @@ ODesignView::ODesignView( Window* pParent,
,m_nCurrentPosition(USHRT_MAX)
,m_eActObj( OBJ_NONE )
,m_bFirstDraw(FALSE)
- ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid
+ ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid
,m_aGridSizeFine( 250, 250 ) // and a 0,25 cm subdivision for better visualisation
,m_bGridVisible(TRUE)
,m_bGridSnap(TRUE)
@@ -281,8 +281,8 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
sal_Int32 nSplitPos = getController().getSplitPos();
if ( 0 != aPlaygroundSize.Width() )
{
- if ( ( -1 == nSplitPos )
- || ( nSplitPos >= aPlaygroundSize.Width() )
+ if ( ( -1 == nSplitPos )
+ || ( nSplitPos >= aPlaygroundSize.Width() )
)
{
long nMinWidth = static_cast<long>(0.1*aPlaygroundSize.Width());
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index 92b6b716860f..686bb65daab5 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,16 +35,16 @@
#include <vcl/lineinfo.hxx>
-#define CORNER_SPACE 5
+#define CORNER_SPACE 5
//=====================================================================
namespace rptui
{
//=====================================================================
DBG_NAME( rpt_OEndMarker )
-OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry)
+OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry)
: OColorListener(_pParent,_sColorEntry)
{
- DBG_CTOR( rpt_OEndMarker,NULL);
+ DBG_CTOR( rpt_OEndMarker,NULL);
SetUniqueId(HID_RPT_ENDMARKER);
ImplInitSettings();
SetPaintTransparent(TRUE);
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 67c6829b75ec..659fc4a32fdd 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -73,7 +73,7 @@ namespace rptui
// {
// const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings();
// BOOL bHighContrast = aStyleSettings.GetHighContrastMode();
- //
+ //
// Color aGetFaceColor = aStyleSettings.GetFaceColor();
// Color aGetCheckedColor = aStyleSettings.GetCheckedColor();
// Color aGetLightColor = aStyleSettings.GetLightColor();
@@ -118,11 +118,11 @@ namespace rptui
// Color aGetHighlightLinkColor = aStyleSettings.GetHighlightLinkColor();
// Color aGetMonoColor = aStyleSettings.GetMonoColor();
// Color aGetActiveTabColor = aStyleSettings.GetActiveTabColor();
- // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor();
- //
+ // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor();
+ //
// Color aWindowColor = aStyleSettings.GetWindowColor();
// Color aLabelColor = aStyleSettings.GetLabelTextColor();
- //
+ //
// // if (m_nTextColor == -1)
// // {
// // svtools::ExtendedColorConfig aConfig;
@@ -130,14 +130,14 @@ namespace rptui
// // }
// return aLabelColor.GetColor();
// }
-
+
//--------------------------------------------------------------------
FixedTextColor::~FixedTextColor()
{
DBG_DTOR(rpt_FixedTextColor,NULL);
}
// -----------------------------------------------------------------------------
-
+
void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent )
{
// (void)_rEvent;
@@ -160,7 +160,7 @@ namespace rptui
DBG_UNHANDLED_EXCEPTION();
}
}
-
+
// -----------------------------------------------------------------------------
void FixedTextColor::setPropertyTextColor(const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nTextColor)
{
@@ -172,7 +172,7 @@ namespace rptui
{
handle(_rxElement);
}
-
+
// -----------------------------------------------------------------------------
void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement )
{
@@ -188,9 +188,9 @@ namespace rptui
sal_Bool bIsDark = sal_False;
const sal_Int32 nBackColor( xFixedText->getControlBackground() );
if ((sal_uInt32)nBackColor == COL_TRANSPARENT)
- {
+ {
uno::Reference <report::XSection> xSection(xFixedText->getParent(), uno::UNO_QUERY_THROW);
-
+
sal_Bool bSectionBackColorIsTransparent = xSection->getBackTransparent();
if (bSectionBackColorIsTransparent)
{
@@ -210,8 +210,8 @@ namespace rptui
{
Color aLabelBackColor(nBackColor);
bIsDark = aLabelBackColor.IsDark();
- }
-
+ }
+
uno::Reference<awt::XVclWindowPeer> xVclWindowPeer = getVclWindowPeer(xFixedText);
if (bIsDark)
{
@@ -224,25 +224,25 @@ namespace rptui
util::Color aLabelColor = xFixedText->getCharColor();
setPropertyTextColor(xVclWindowPeer, aLabelColor);
}
-
+
}
catch( const uno::Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
}
-
+
// -----------------------------------------------------------------------------
// XPropertyChangeListener
uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException)
{
-
+
uno::Reference<awt::XControl> xControl;
OReportController *pController = (OReportController *)&m_rReportController;
-
+
::boost::shared_ptr<OReportModel> pModel = pController->getSdrModel();
-
+
uno::Reference<report::XSection> xSection(_xFixedText->getSection());
if ( xSection.is() )
{
@@ -266,7 +266,7 @@ namespace rptui
}
return xControl;
}
-
+
// -----------------------------------------------------------------------------
uno::Reference<awt::XVclWindowPeer> FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent) throw(uno::RuntimeException)
{
@@ -280,7 +280,7 @@ namespace rptui
-
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 4cb76497d7f8..2e604a95da34 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -78,7 +78,7 @@ namespace rptui
}
return m_nTextColor;
}
-
+
//--------------------------------------------------------------------
FormattedFieldBeautifier::~FormattedFieldBeautifier()
{
@@ -127,7 +127,7 @@ namespace rptui
DBG_UNHANDLED_EXCEPTION();
}
}
-
+
// -----------------------------------------------------------------------------
void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText )
{
@@ -146,7 +146,7 @@ namespace rptui
aFontDescriptorStructure.Slant = ::com::sun::star::awt::FontSlant_ITALIC;
_xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR, uno::makeAny(aFontDescriptorStructure));
}
-
+
// -----------------------------------------------------------------------------
void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent )
{
@@ -156,7 +156,7 @@ namespace rptui
setPlaceholderText( _rEvent.Source );
}
-
+
// -----------------------------------------------------------------------------
void FormattedFieldBeautifier::handle( const uno::Reference< uno::XInterface >& _rxElement )
{
@@ -168,17 +168,17 @@ namespace rptui
{
handle( _rxElement );
}
-
+
// -----------------------------------------------------------------------------
uno::Reference<awt::XVclWindowPeer> FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent) throw(uno::RuntimeException)
- {
+ {
uno::Reference<awt::XVclWindowPeer> xVclWindowPeer;
::boost::shared_ptr<OReportModel> pModel = const_cast< OReportController& >( m_rReportController ).getSdrModel();
-
+
uno::Reference<report::XSection> xSection(_xComponent->getSection());
if ( xSection.is() )
- {
+ {
OReportPage *pPage = pModel->getPage(xSection);
ULONG nIndex = pPage->getIndexOf(_xComponent);
if (nIndex < pPage->GetObjCount() )
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 4b520a915a9a..473e3b366ee7 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,21 +27,21 @@
************************************************************************/
#include "precompiled_reportdesign.hxx"
-#define RPTUI_ID_LRSPACE 1
-#define RPTUI_ID_ULSPACE 2
-#define RPTUI_ID_PAGE 3
-#define RPTUI_ID_SIZE 4
-#define RPTUI_ID_PAGE_MODE 5
-#define RPTUI_ID_START 6
-#define RPTUI_ID_END 7
-#define RPTUI_ID_BRUSH 8
-#define RPTUI_ID_METRIC 9
+#define RPTUI_ID_LRSPACE 1
+#define RPTUI_ID_ULSPACE 2
+#define RPTUI_ID_PAGE 3
+#define RPTUI_ID_SIZE 4
+#define RPTUI_ID_PAGE_MODE 5
+#define RPTUI_ID_START 6
+#define RPTUI_ID_END 7
+#define RPTUI_ID_BRUSH 8
+#define RPTUI_ID_METRIC 9
#define ITEMID_LRSPACE RPTUI_ID_LRSPACE
#define ITEMID_ULSPACE RPTUI_ID_ULSPACE
#define ITEMID_SIZE RPTUI_ID_SIZE
-#define ITEMID_PAGE RPTUI_ID_PAGE
-#define ITEMID_BRUSH RPTUI_ID_BRUSH
+#define ITEMID_PAGE RPTUI_ID_PAGE
+#define ITEMID_BRUSH RPTUI_ID_BRUSH
#include "ReportController.hxx"
@@ -373,7 +373,7 @@ void OReportController::disposing()
pSectionWindow = getDesignView()->getMarkedSection();
if ( pSectionWindow )
pSectionWindow->getReportSection().deactivateOle();
- getUndoMgr()->Clear(); // clear all undo redo things
+ getUndoMgr()->Clear(); // clear all undo redo things
if ( m_aReportModel )
listen(false);
m_pReportControllerObserver->Clear();
@@ -1641,7 +1641,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
// don't change anything here so return
return;
case RET_NO:
- setModified(sal_False); // and we are not modified yet
+ setModified(sal_False); // and we are not modified yet
break;
default:
break;
@@ -1703,8 +1703,8 @@ void OReportController::impl_initialize( )
if ( m_xReportDefinition.is() )
{
//m_sName = m_xReportDefinition->getName();
- getView()->initialize(); // show the windows and fill with our informations
- getUndoMgr()->Clear(); // clear all undo redo things
+ getView()->initialize(); // show the windows and fill with our informations
+ getUndoMgr()->Clear(); // clear all undo redo things
getSdrModel();
if ( !m_aReportModel )
throw Exception();
@@ -1776,7 +1776,7 @@ void OReportController::impl_initialize( )
executeUnChecked(SID_SELECT_REPORT,aArgs);
} // if ( m_bShowProperties && m_nPageNum == -1 )
- setModified(sal_False); // and we are not modified yet
+ setModified(sal_False); // and we are not modified yet
// open the global help agent
// we need a Frame but at this time there is no frame, therefore we send a UserEvent
@@ -1861,265 +1861,265 @@ void OReportController::describeSupportedFeatures()
{
OSingleDocumentController::describeSupportedFeatures();
- implDescribeSupportedFeature( ".uno:TextDocument", SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION );
- implDescribeSupportedFeature( ".uno:Spreadsheet", SID_RPT_SPREADSHEET, CommandGroup::APPLICATION );
-
- implDescribeSupportedFeature( ".uno:Redo", SID_REDO, CommandGroup::EDIT );
- implDescribeSupportedFeature( ".uno:Undo", SID_UNDO, CommandGroup::EDIT );
- //implDescribeSupportedFeature( ".uno:PasteSpecial", SID_PASTE, CommandGroup::EDIT );
- implDescribeSupportedFeature( ".uno:SelectAll", SID_SELECTALL, CommandGroup::EDIT );
- implDescribeSupportedFeature( ".uno:SelectAllInSection", SID_SELECTALL_IN_SECTION, CommandGroup::EDIT );
- implDescribeSupportedFeature( ".uno:Delete", SID_DELETE, CommandGroup::EDIT );
- implDescribeSupportedFeature( ".uno:SelectReport", SID_SELECT_REPORT, CommandGroup::EDIT );
- implDescribeSupportedFeature( ".uno:ExecuteReport", SID_EXECUTE_REPORT, CommandGroup::EDIT );
-
- implDescribeSupportedFeature( ".uno:GridVisible", SID_GRID_VISIBLE, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:GridUse", SID_GRID_USE, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:HelplinesMove", SID_HELPLINES_MOVE, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:ShowRuler", SID_RULER, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:AddField", SID_FM_ADD_FIELD, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:ReportNavigator", SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:ControlProperties", SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW );
- //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:DbSortingAndGrouping", SID_SORTINGANDGROUPING, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:PageHeaderFooter", SID_PAGEHEADERFOOTER, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:ReportHeaderFooter", SID_REPORTHEADERFOOTER, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:ZoomSlider", SID_ATTR_ZOOMSLIDER, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:Zoom", SID_ATTR_ZOOM, CommandGroup::VIEW );
- //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW );
-
- implDescribeSupportedFeature( ".uno:ConditionalFormatting", SID_CONDITIONALFORMATTING, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:PageDialog", SID_PAGEDIALOG, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:ResetAttributes", SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT );
-
- implDescribeSupportedFeature( ".uno:Bold", SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:Italic", SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:Underline", SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:BackColor", SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:BackgroundColor", SID_BACKGROUND_COLOR, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:Color", SID_ATTR_CHAR_COLOR);
- implDescribeSupportedFeature( ".uno:FontColor", SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:FontDialog", SID_CHAR_DLG, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:LeftPara", SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT );
-
- implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT );
-
- implDescribeSupportedFeature( ".uno:ArrangeMenu", SID_ARRANGEMENU, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:BringToFront", SID_FRAME_TO_TOP, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:ObjectBackOne", SID_FRAME_DOWN, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:ObjectForwardOne", SID_FRAME_UP, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SendToBack", SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SetObjectToForeground", SID_OBJECT_HEAVEN, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SetObjectToBackground", SID_OBJECT_HELL, CommandGroup::FORMAT );
-
- implDescribeSupportedFeature( ".uno:ObjectAlign", SID_OBJECT_ALIGN, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:ObjectAlignLeft", SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:AlignCenter", SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:ObjectAlignRight", SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:AlignUp", SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:AlignMiddle", SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:AlignDown", SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT );
-
- implDescribeSupportedFeature( ".uno:SectionAlign", SID_SECTION_ALIGN, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SectionAlignLeft", SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SectionAlignCenter", SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SectionAlignRight", SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SectionAlignTop", SID_SECTION_ALIGN_UP, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SectionAlignMiddle", SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SectionAlignBottom", SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:TextDocument", SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION );
+ implDescribeSupportedFeature( ".uno:Spreadsheet", SID_RPT_SPREADSHEET, CommandGroup::APPLICATION );
+
+ implDescribeSupportedFeature( ".uno:Redo", SID_REDO, CommandGroup::EDIT );
+ implDescribeSupportedFeature( ".uno:Undo", SID_UNDO, CommandGroup::EDIT );
+ //implDescribeSupportedFeature( ".uno:PasteSpecial", SID_PASTE, CommandGroup::EDIT );
+ implDescribeSupportedFeature( ".uno:SelectAll", SID_SELECTALL, CommandGroup::EDIT );
+ implDescribeSupportedFeature( ".uno:SelectAllInSection", SID_SELECTALL_IN_SECTION, CommandGroup::EDIT );
+ implDescribeSupportedFeature( ".uno:Delete", SID_DELETE, CommandGroup::EDIT );
+ implDescribeSupportedFeature( ".uno:SelectReport", SID_SELECT_REPORT, CommandGroup::EDIT );
+ implDescribeSupportedFeature( ".uno:ExecuteReport", SID_EXECUTE_REPORT, CommandGroup::EDIT );
+
+ implDescribeSupportedFeature( ".uno:GridVisible", SID_GRID_VISIBLE, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:GridUse", SID_GRID_USE, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:HelplinesMove", SID_HELPLINES_MOVE, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:ShowRuler", SID_RULER, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:AddField", SID_FM_ADD_FIELD, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:ReportNavigator", SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:ControlProperties", SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW );
+ //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:DbSortingAndGrouping", SID_SORTINGANDGROUPING, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:PageHeaderFooter", SID_PAGEHEADERFOOTER, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:ReportHeaderFooter", SID_REPORTHEADERFOOTER, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:ZoomSlider", SID_ATTR_ZOOMSLIDER, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:Zoom", SID_ATTR_ZOOM, CommandGroup::VIEW );
+ //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW );
+
+ implDescribeSupportedFeature( ".uno:ConditionalFormatting", SID_CONDITIONALFORMATTING, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:PageDialog", SID_PAGEDIALOG, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:ResetAttributes", SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT );
+
+ implDescribeSupportedFeature( ".uno:Bold", SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:Italic", SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:Underline", SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:BackColor", SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:BackgroundColor", SID_BACKGROUND_COLOR, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:Color", SID_ATTR_CHAR_COLOR);
+ implDescribeSupportedFeature( ".uno:FontColor", SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:FontDialog", SID_CHAR_DLG, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:LeftPara", SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT );
+
+ implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT );
+
+ implDescribeSupportedFeature( ".uno:ArrangeMenu", SID_ARRANGEMENU, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:BringToFront", SID_FRAME_TO_TOP, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:ObjectBackOne", SID_FRAME_DOWN, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:ObjectForwardOne", SID_FRAME_UP, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SendToBack", SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SetObjectToForeground", SID_OBJECT_HEAVEN, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SetObjectToBackground", SID_OBJECT_HELL, CommandGroup::FORMAT );
+
+ implDescribeSupportedFeature( ".uno:ObjectAlign", SID_OBJECT_ALIGN, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:ObjectAlignLeft", SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:AlignCenter", SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:ObjectAlignRight", SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:AlignUp", SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:AlignMiddle", SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:AlignDown", SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT );
+
+ implDescribeSupportedFeature( ".uno:SectionAlign", SID_SECTION_ALIGN, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SectionAlignLeft", SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SectionAlignCenter", SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SectionAlignRight", SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SectionAlignTop", SID_SECTION_ALIGN_UP, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SectionAlignMiddle", SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SectionAlignBottom", SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:SectionShrink", SID_SECTION_SHRINK, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:SectionShrinkTop", SID_SECTION_SHRINK_TOP, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:SectionShrinkBottom", SID_SECTION_SHRINK_BOTTOM, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:ObjectResize", SID_OBJECT_RESIZING, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SmallestWidth", SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SmallestHeight", SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:GreatestWidth", SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:GreatestHeight", SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:Distribution", SID_DISTRIBUTION, CommandGroup::FORMAT );
-
- implDescribeSupportedFeature( ".uno:HelpMenu", SID_HELPMENU, CommandGroup::APPLICATION );
- implDescribeSupportedFeature( ".uno:ExportTo", SID_EXPORTDOC, CommandGroup::APPLICATION );
- implDescribeSupportedFeature( ".uno:ExportToPDF", SID_EXPORTDOCASPDF, CommandGroup::APPLICATION );
- implDescribeSupportedFeature( ".uno:PrintPreview", SID_PRINTPREVIEW, CommandGroup::APPLICATION );
-
- implDescribeSupportedFeature( ".uno:NewDoc", SID_NEWDOC, CommandGroup::DOCUMENT );
- implDescribeSupportedFeature( ".uno:Save", SID_SAVEDOC, CommandGroup::DOCUMENT );
- implDescribeSupportedFeature( ".uno:SaveAs", SID_SAVEASDOC, CommandGroup::DOCUMENT );
-
- implDescribeSupportedFeature( ".uno:InsertPageNumberField", SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:InsertDateTimeField", SID_DATETIME, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:InsertObjectChart", SID_INSERT_DIAGRAM, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:InsertGraphic", SID_INSERT_GRAPHIC, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ObjectResize", SID_OBJECT_RESIZING, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SmallestWidth", SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SmallestHeight", SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:GreatestWidth", SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:GreatestHeight", SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:Distribution", SID_DISTRIBUTION, CommandGroup::FORMAT );
+
+ implDescribeSupportedFeature( ".uno:HelpMenu", SID_HELPMENU, CommandGroup::APPLICATION );
+ implDescribeSupportedFeature( ".uno:ExportTo", SID_EXPORTDOC, CommandGroup::APPLICATION );
+ implDescribeSupportedFeature( ".uno:ExportToPDF", SID_EXPORTDOCASPDF, CommandGroup::APPLICATION );
+ implDescribeSupportedFeature( ".uno:PrintPreview", SID_PRINTPREVIEW, CommandGroup::APPLICATION );
+
+ implDescribeSupportedFeature( ".uno:NewDoc", SID_NEWDOC, CommandGroup::DOCUMENT );
+ implDescribeSupportedFeature( ".uno:Save", SID_SAVEDOC, CommandGroup::DOCUMENT );
+ implDescribeSupportedFeature( ".uno:SaveAs", SID_SAVEASDOC, CommandGroup::DOCUMENT );
+
+ implDescribeSupportedFeature( ".uno:InsertPageNumberField", SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:InsertDateTimeField", SID_DATETIME, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:InsertObjectChart", SID_INSERT_DIAGRAM, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:InsertGraphic", SID_INSERT_GRAPHIC, CommandGroup::INSERT );
// controls
- implDescribeSupportedFeature( ".uno:SelectObject", SID_OBJECT_SELECT, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:Label", SID_FM_FIXEDTEXT, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:Edit", SID_FM_EDIT, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ImageControl", SID_FM_IMAGECONTROL, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:HFixedLine", SID_INSERT_HFIXEDLINE, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:VFixedLine", SID_INSERT_VFIXEDLINE, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SelectObject", SID_OBJECT_SELECT, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:Label", SID_FM_FIXEDTEXT, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:Edit", SID_FM_EDIT, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ImageControl", SID_FM_IMAGECONTROL, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:HFixedLine", SID_INSERT_HFIXEDLINE, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:VFixedLine", SID_INSERT_VFIXEDLINE, CommandGroup::INSERT );
// shapes
- implDescribeSupportedFeature( ".uno:BasicShapes", SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.rectangle", SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.round-rectangle",SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.quadrat", SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.round-quadrat", SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.circle", SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.ellipse", SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.circle-pie", SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.isosceles-triangle",SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.right-triangle",SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.trapezoid", SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.diamond", SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.parallelogram", SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.pentagon", SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.hexagon", SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.octagon", SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.cross", SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.ring", SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.block-arc", SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.can", SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.cube", SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.paper", SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:BasicShapes.frame", SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:SymbolShapes", SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:SymbolShapes.smiley" , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.sun" , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.moon" , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.lightning" , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.heart" , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.flower" , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.cloud" , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.forbidden" , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.puzzle" , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.bracket-pair" ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.left-bracket" ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.right-bracket",SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.brace-pair" , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.left-brace" , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.right-brace" , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.quad-bevel" , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.octagon-bevel",SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:SymbolShapes.diamond-bevel",SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow" , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow" , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow" , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow" , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow" , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow" , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow" , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-down-arrow" , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow" , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.corner-right-arrow" , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.split-arrow" , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.striped-right-arrow" , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.notched-right-arrow" , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.pentagon-right" , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.chevron" , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow-callout" , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow-callout" , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow-callout" , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow-callout" , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow-callout",SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow-callout" ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow-callout",SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow-callout" , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.circular-arrow" , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.split-round-arrow" , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:ArrowShapes.s-sharped-arrow" , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:StarShapes.bang" , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.star4" , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.star5" , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.star6" , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.star8" , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.star12" , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.star24" , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.concave-star6" , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.vertical-scroll" , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.horizontal-scroll" , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.signet" , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes.doorplate" , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-process" , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-alternate-process" , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-decision" , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-data" , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-predefined-process" , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-internal-storage" , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-document" , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-multidocument" , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-terminator" , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-preparation" , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-input" , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-operation" , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-connector" , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-off-page-connector" , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-card" , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-punched-tape" , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-summing-junction" , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-or" , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-collate" , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sort" , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-extract" , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-merge" , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-stored-data" , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-delay" , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sequential-access" , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-magnetic-disk" , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-direct-access-storage",SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-display" , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:CalloutShapes.rectangular-callout" , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:CalloutShapes.round-rectangular-callout" , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:CalloutShapes.round-callout" , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:CalloutShapes.cloud-callout" , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-1" , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-2" , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-3" , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:ArrowShapes", SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT );
-
- implDescribeSupportedFeature( ".uno:FlowChartShapes", SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:CalloutShapes", SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT );
- implDescribeSupportedFeature( ".uno:StarShapes", SID_DRAWTBX_CS_STAR, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes", SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.rectangle", SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.round-rectangle",SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.quadrat", SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.round-quadrat", SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.circle", SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.ellipse", SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.circle-pie", SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.isosceles-triangle",SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.right-triangle",SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.trapezoid", SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.diamond", SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.parallelogram", SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.pentagon", SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.hexagon", SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.octagon", SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.cross", SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.ring", SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.block-arc", SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.can", SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.cube", SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.paper", SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:BasicShapes.frame", SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:SymbolShapes", SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:SymbolShapes.smiley" , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.sun" , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.moon" , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.lightning" , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.heart" , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.flower" , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.cloud" , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.forbidden" , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.puzzle" , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.bracket-pair" ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.left-bracket" ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.right-bracket",SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.brace-pair" , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.left-brace" , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.right-brace" , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.quad-bevel" , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.octagon-bevel",SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:SymbolShapes.diamond-bevel",SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow" , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow" , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow" , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow" , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow" , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow" , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow" , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-down-arrow" , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow" , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.corner-right-arrow" , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.split-arrow" , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.striped-right-arrow" , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.notched-right-arrow" , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.pentagon-right" , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.chevron" , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow-callout" , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow-callout" , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow-callout" , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow-callout" , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow-callout",SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow-callout" ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow-callout",SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow-callout" , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.circular-arrow" , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.split-round-arrow" , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:ArrowShapes.s-sharped-arrow" , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:StarShapes.bang" , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.star4" , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.star5" , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.star6" , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.star8" , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.star12" , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.star24" , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.concave-star6" , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.vertical-scroll" , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.horizontal-scroll" , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.signet" , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes.doorplate" , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-process" , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-alternate-process" , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-decision" , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-data" , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-predefined-process" , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-internal-storage" , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-document" , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-multidocument" , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-terminator" , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-preparation" , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-input" , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-operation" , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-connector" , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-off-page-connector" , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-card" , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-punched-tape" , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-summing-junction" , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-or" , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-collate" , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sort" , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-extract" , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-merge" , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-stored-data" , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-delay" , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sequential-access" , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-magnetic-disk" , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-direct-access-storage",SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-display" , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:CalloutShapes.rectangular-callout" , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:CalloutShapes.round-rectangular-callout" , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:CalloutShapes.round-callout" , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:CalloutShapes.cloud-callout" , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-1" , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-2" , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-3" , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:ArrowShapes", SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT );
+
+ implDescribeSupportedFeature( ".uno:FlowChartShapes", SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:CalloutShapes", SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:StarShapes", SID_DRAWTBX_CS_STAR, CommandGroup::INSERT );
// keys
- implDescribeSupportedFeature( ".uno:Escape", SID_ESCAPE, CommandGroup::CONTROLS);
+ implDescribeSupportedFeature( ".uno:Escape", SID_ESCAPE, CommandGroup::CONTROLS);
// internal one
- implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO", SID_REPORTHEADER_WITHOUT_UNDO);
- implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO", SID_REPORTFOOTER_WITHOUT_UNDO);
- implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO", SID_PAGEHEADER_WITHOUT_UNDO);
- implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO", SID_PAGEFOOTER_WITHOUT_UNDO);
- implDescribeSupportedFeature( ".uno:DBBackgroundColor", SID_ATTR_CHAR_COLOR_BACKGROUND);
- implDescribeSupportedFeature( ".uno:SID_GROUPHEADER", SID_GROUPHEADER);
- implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO", SID_GROUPHEADER_WITHOUT_UNDO);
- implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER", SID_GROUPFOOTER);
- implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER_WITHOUT_UNDO", SID_GROUPFOOTER_WITHOUT_UNDO);
- implDescribeSupportedFeature( ".uno:SID_GROUP_REMOVE", SID_GROUP_REMOVE);
- implDescribeSupportedFeature( ".uno:SID_GROUP_APPEND", SID_GROUP_APPEND);
- implDescribeSupportedFeature( ".uno:SID_ADD_CONTROL_PAIR", SID_ADD_CONTROL_PAIR);
- implDescribeSupportedFeature( ".uno:SplitPosition", SID_SPLIT_POSITION);
- implDescribeSupportedFeature( ".uno:LastPropertyBrowserPage", SID_PROPERTYBROWSER_LAST_PAGE);
- implDescribeSupportedFeature( ".uno:Select", SID_SELECT);
- implDescribeSupportedFeature( ".uno:InsertFunction", SID_RPT_NEW_FUNCTION);
- implDescribeSupportedFeature( ".uno:NextMark", SID_NEXT_MARK);
- implDescribeSupportedFeature( ".uno:PrevMark", SID_PREV_MARK);
+ implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO", SID_REPORTHEADER_WITHOUT_UNDO);
+ implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO", SID_REPORTFOOTER_WITHOUT_UNDO);
+ implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO", SID_PAGEHEADER_WITHOUT_UNDO);
+ implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO", SID_PAGEFOOTER_WITHOUT_UNDO);
+ implDescribeSupportedFeature( ".uno:DBBackgroundColor", SID_ATTR_CHAR_COLOR_BACKGROUND);
+ implDescribeSupportedFeature( ".uno:SID_GROUPHEADER", SID_GROUPHEADER);
+ implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO", SID_GROUPHEADER_WITHOUT_UNDO);
+ implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER", SID_GROUPFOOTER);
+ implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER_WITHOUT_UNDO", SID_GROUPFOOTER_WITHOUT_UNDO);
+ implDescribeSupportedFeature( ".uno:SID_GROUP_REMOVE", SID_GROUP_REMOVE);
+ implDescribeSupportedFeature( ".uno:SID_GROUP_APPEND", SID_GROUP_APPEND);
+ implDescribeSupportedFeature( ".uno:SID_ADD_CONTROL_PAIR", SID_ADD_CONTROL_PAIR);
+ implDescribeSupportedFeature( ".uno:SplitPosition", SID_SPLIT_POSITION);
+ implDescribeSupportedFeature( ".uno:LastPropertyBrowserPage", SID_PROPERTYBROWSER_LAST_PAGE);
+ implDescribeSupportedFeature( ".uno:Select", SID_SELECT);
+ implDescribeSupportedFeature( ".uno:InsertFunction", SID_RPT_NEW_FUNCTION);
+ implDescribeSupportedFeature( ".uno:NextMark", SID_NEXT_MARK);
+ implDescribeSupportedFeature( ".uno:PrevMark", SID_PREV_MARK);
implDescribeSupportedFeature( ".uno:TerminateInplaceActivation", SID_TERMINATE_INPLACEACTIVATION);
implDescribeSupportedFeature( ".uno:SelectAllLabels", SID_SELECT_ALL_LABELS);
implDescribeSupportedFeature( ".uno:SelectAllEdits", SID_SELECT_ALL_EDITS);
- implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION);
- implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION);
+ implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION);
+ implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION);
}
// -----------------------------------------------------------------------------
SfxUndoManager* OReportController::getUndoMgr()
@@ -2429,16 +2429,16 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
// UNO->ItemSet
static SfxItemInfo aItemInfos[] =
{
- { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE },
- { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE },
- { SID_ATTR_PAGE, SFX_ITEM_POOLABLE },
- { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE },
- { SID_ENUM_PAGE_MODE, SFX_ITEM_POOLABLE },
- { SID_PAPER_START, SFX_ITEM_POOLABLE },
- { SID_PAPER_END, SFX_ITEM_POOLABLE },
- { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE },
- { SID_FLAG_TYPE, SFX_ITEM_POOLABLE },
- { SID_ATTR_METRIC, SFX_ITEM_POOLABLE }
+ { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE },
+ { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE },
+ { SID_ATTR_PAGE, SFX_ITEM_POOLABLE },
+ { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE },
+ { SID_ENUM_PAGE_MODE, SFX_ITEM_POOLABLE },
+ { SID_PAPER_START, SFX_ITEM_POOLABLE },
+ { SID_PAPER_END, SFX_ITEM_POOLABLE },
+ { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE },
+ { SID_FLAG_TYPE, SFX_ITEM_POOLABLE },
+ { SID_ATTR_METRIC, SFX_ITEM_POOLABLE }
};
MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
@@ -2463,8 +2463,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
0
};
SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) );
- pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why
- pPool->FreezeIdRanges(); // the same
+ pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why
+ pPool->FreezeIdRanges(); // the same
try
{
@@ -2495,7 +2495,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
}
}
- { // want the dialog to be destroyed before our set
+ { // want the dialog to be destroyed before our set
ORptPageDialog aDlg(getView(), pDescriptor.get(),_xSection.is() ? RID_PAGEDIALOG_BACKGROUND : RID_PAGEDIALOG_PAGE);
if (RET_OK == aDlg.Execute())
{
@@ -3594,7 +3594,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
OUnoObject* pObj = dynamic_cast<OUnoObject*>(pControl[0]);
uno::Reference< report::XFixedText> xShapeProp(pObj->getUnoShape(),uno::UNO_QUERY_THROW);
xShapeProp->setName(xShapeProp->getName() + sDefaultName );
-
+
for(i = 0; i < SAL_N_ELEMENTS(pControl);++i) // insert controls
{
correctOverlapping(pControl[i],pSectionWindow[1-i]->getReportSection());
@@ -3642,7 +3642,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
// this should never happen.
// else
// {
- // DBG_ERROR("unhandled case.");
+ // DBG_ERROR("unhandled case.");
// }
}
}
@@ -3717,7 +3717,7 @@ void OReportController::listen(const bool _bAdd)
uno::Reference< XPropertyChangeListener > xUndo = &rUndoEnv;
uno::Sequence< beans::Property> aSeq = m_xReportDefinition->getPropertySetInfo()->getProperties();
const beans::Property* pIter = aSeq.getConstArray();
- const beans::Property* pEnd = pIter + aSeq.getLength();
+ const beans::Property* pEnd = pIter + aSeq.getLength();
const ::rtl::OUString* pPropsBegin = &aProps[0];
const ::rtl::OUString* pPropsEnd = pPropsBegin + (SAL_N_ELEMENTS(aProps)) - 3;
for(;pIter != pEnd;++pIter)
@@ -4275,8 +4275,8 @@ void OReportController::openZoomDialog()
0
};
SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) );
- pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why
- pPool->FreezeIdRanges(); // the same
+ pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why
+ pPool->FreezeIdRanges(); // the same
try
{
::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges));
@@ -4291,7 +4291,7 @@ void OReportController::openZoomDialog()
if ( !bCancel )
{
- const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM );
+ const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM );
m_eZoomType = rZoomItem.GetType();
m_nZoomValue = rZoomItem.GetValue();
if ( m_eZoomType != SVX_ZOOM_PERCENT )
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 45c389f94bef..007e0e01966e 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -78,7 +78,7 @@ public:
,m_bReadOnly(sal_False)
{
}
-
+
OXReportControllerObserverImpl::~OXReportControllerObserverImpl()
{
}
@@ -119,7 +119,7 @@ public:
nEvent == VCLEVENT_WINDOW_RESIZE ||
nEvent == VCLEVENT_WINDOW_SHOW ||
nEvent == VCLEVENT_WINDOW_MOUSEMOVE ||
- nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED ||
+ nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED ||
nEvent == VCLEVENT_WINDOW_HIDE ||
nEvent == VCLEVENT_EDIT_MODIFY ||
nEvent == VCLEVENT_SCROLLBAR_ENDSCROLL ||
@@ -136,18 +136,18 @@ public:
return 0L;
}
*/
-
+
if (nEvent == VCLEVENT_APPLICATION_DATACHANGED )
{
DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData());
- if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) ||
- ( pData->GetType() == DATACHANGED_DISPLAY )) &&
- ( pData->GetFlags() & SETTINGS_STYLE )))
+ if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) ||
+ ( pData->GetType() == DATACHANGED_DISPLAY )) &&
+ ( pData->GetFlags() & SETTINGS_STYLE )))
{
OEnvLock aLock(*this);
-
+
// sal_uInt32 nCount = m_pImpl->m_aSections.size();
-
+
// send all Section Objects a 'tingle'
// maybe they need a change in format, color, etc
::std::vector< uno::Reference< container::XChild > >::const_iterator aIter = m_pImpl->m_aSections.begin();
@@ -159,7 +159,7 @@ public:
{
uno::Reference<report::XSection> xSection(xChild, uno::UNO_QUERY);
if (xSection.is())
- {
+ {
const sal_Int32 nCount = xSection->getCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
@@ -177,7 +177,7 @@ public:
}
}
}
-
+
return 0L;
}
@@ -196,14 +196,14 @@ public:
RemoveElement(xSourceSet);
}
}
-
+
void OXReportControllerObserver::Clear()
{
OEnvLock aLock(*this);
// sal_uInt32 nDebugValue = m_pImpl->m_aSections.size();
m_pImpl->m_aSections.clear();
}
-
+
// XPropertyChangeListener
void SAL_CALL OXReportControllerObserver::propertyChange(const beans::PropertyChangeEvent& _rEvent) throw(uno::RuntimeException)
{
@@ -214,20 +214,20 @@ public:
return;
m_aFormattedFieldBeautifier.notifyPropertyChange(_rEvent);
- m_aFixedTextColor.notifyPropertyChange(_rEvent);
+ m_aFixedTextColor.notifyPropertyChange(_rEvent);
}
-
+
// -----------------------------------------------------------------------------
-void OXReportControllerObserver::Lock()
-{
+void OXReportControllerObserver::Lock()
+{
OSL_ENSURE(m_refCount,"Illegal call to dead object!");
- osl_incrementInterlockedCount( &m_pImpl->m_nLocks );
+ osl_incrementInterlockedCount( &m_pImpl->m_nLocks );
}
-void OXReportControllerObserver::UnLock()
-{
+void OXReportControllerObserver::UnLock()
+{
OSL_ENSURE(m_refCount,"Illegal call to dead object!");
- osl_decrementInterlockedCount( &m_pImpl->m_nLocks );
+ osl_decrementInterlockedCount( &m_pImpl->m_nLocks );
}
sal_Bool OXReportControllerObserver::IsLocked() const { return m_pImpl->m_nLocks != 0; }
@@ -379,7 +379,7 @@ void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterfac
m_aFormattedFieldBeautifier.notifyElementInserted(_rxElement);
m_aFixedTextColor.notifyElementInserted(_rxElement);
// }
-
+
// if it's a container, start listening at all elements
uno::Reference< container::XIndexAccess > xContainer( _rxElement, uno::UNO_QUERY );
if ( xContainer.is() )
@@ -405,7 +405,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter
if ( _xContainer.is() )
{
aFind = ::std::find(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),_xContainer);
-
+
if ( aFind == m_pImpl->m_aSections.end() )
{
uno::Reference<container::XChild> xParent(_xContainer->getParent(),uno::UNO_QUERY);
diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx
index 2867f9fee662..a345d00550c0 100644
--- a/reportdesign/source/ui/report/ReportRuler.cxx
+++ b/reportdesign/source/ui/report/ReportRuler.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,14 +32,14 @@
namespace rptui
{
using namespace ::com::sun::star;
-DBG_NAME( rpt_OReportRuler )
+DBG_NAME( rpt_OReportRuler )
OReportRuler::OReportRuler(Window* _pParent,OReportWindow* _pReportWindow,const uno::Reference< report::XSection >& _xSection)
:Window(_pParent)
,m_pParent(_pReportWindow)
{
DBG_CTOR( rpt_OReportRuler,NULL);
SetMapMode( MapMode( MAP_100TH_MM ) );
-
+
Show();
}
//------------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 875adf1118e3..9c7888e12c27 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -85,7 +85,7 @@ sal_Int32 lcl_getOverlappedControlColor(/*const uno::Reference <lang::XMultiServ
}
//------------------------------------------------------------------------------
DBG_NAME( rpt_OReportSection )
-OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection)
+OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection)
: Window(_pParent,WB_DIALOGCONTROL)
, ::comphelper::OPropertyChangeListener(m_aMutex)
, DropTargetHelper(this)
@@ -104,7 +104,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
EnableChildTransparentMode();
SetHelpId(HID_REPORTSECTION);
SetMapMode( MapMode( MAP_100TH_MM ) );
-
+
try
{
fill();
@@ -125,11 +125,11 @@ OReportSection::~OReportSection()
//m_pModel->GetUndoEnv().RemoveSection(m_xSection.get());
if ( m_pMulti.is() )
m_pMulti->dispose();
-
+
if ( m_pReportListener.is() )
m_pReportListener->dispose();
m_pFunc = ::std::auto_ptr<DlgEdFunc>();
-
+
{
::std::auto_ptr<OSectionView> aTemp( m_pView);
if ( m_pView )
@@ -227,7 +227,7 @@ void OReportSection::fill()
const Fraction aY(aGridSizeFine.B());
m_pView->SetSnapGridWidth(aX, aY);
- m_pView->SetGridSnap( pDesignView->isGridSnap() );
+ m_pView->SetGridSnap( pDesignView->isGridSnap() );
m_pView->SetGridFront( FALSE );
m_pView->SetDragStripes( TRUE );
m_pView->SetPageVisible();
@@ -244,7 +244,7 @@ void OReportSection::fill()
// LLA: TODO
// m_pPage->SetUppBorder(-10000);
- m_pView->SetDesignMode( TRUE );
+ m_pView->SetDesignMode( TRUE );
m_pView->StartListening( *m_pModel );
/*Resize();*/
@@ -290,7 +290,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
SvxShape* pShape = SvxShape::getImplementation( *pCopiesIter );
SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL;
if ( pObject )
- {
+ {
SdrObject* pNeuObj = pObject->Clone();
pNeuObj->SetPage( m_pPage );
@@ -354,16 +354,16 @@ void OReportSection::SetMode( DlgEdMode eNewMode )
m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( ) );
m_pModel->SetReadOnly(eNewMode == RPTUI_READONLY);
m_eMode = eNewMode;
- }
+ }
}
// -----------------------------------------------------------------------------
void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects)
-{
+{
Copy(_rAllreadyCopiedObjects,false);
}
//----------------------------------------------------------------------------
void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects,bool _bEraseAnddNoClone)
-{
+{
OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!");
if( !m_pView->AreObjectsMarked() || !m_xSection.is() )
return;
@@ -379,7 +379,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
aCopies.reserve(nMark);
SdrUndoFactory& rUndo = m_pView->GetModel()->GetSdrUndoFactory();
-
+
for( ULONG i = nMark; i > 0; )
{
--i;
@@ -452,13 +452,13 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType)
{
m_pView->UnmarkAll();
SdrObjListIter aIter(*m_pPage,IM_DEEPNOGROUPS);
- SdrObject* pObjIter = NULL;
+ SdrObject* pObjIter = NULL;
while( (pObjIter = aIter.Next()) != NULL )
{
if ( pObjIter->GetObjIdentifier() == _nObjectType )
m_pView->MarkObj( pObjIter, m_pView->GetSdrPageView() );
}
- }
+ }
}
}
void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rController,const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame,BOOL _bHiContrast)
@@ -506,9 +506,9 @@ void OReportSection::Command( const CommandEvent& _rCEvt )
BOOL bHiContrast = rSettings.GetHighContrastMode();
OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController();
uno::Reference<frame::XFrame> xFrame = rController.getFrame();
- PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) );
+ PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) );
uno::Reference< report::XReportDefinition> xReportDefinition = getSection()->getReportDefinition();
-
+
lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame,bHiContrast);
Point aPos = _rCEvt.GetMousePosPixel();
@@ -595,7 +595,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
}
if ( aPos.Y < 0 )
aPos.Y = 0;
- if ( bChanged )
+ if ( bChanged )
{
xReportComponent->setPosition(aPos);
correctOverlapping(pObject,*this,false);
@@ -616,7 +616,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
Resize();
}
- }
+ }
}
//------------------------------------------------------------------------------
sal_Bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent)
@@ -662,7 +662,7 @@ void OReportSection::createDefault(const ::rtl::OUString& _sType,SdrObject* _pOb
if( pSourceObj )
{
const SfxItemSet& rSource = pSourceObj->GetMergedItemSet();
- SfxItemSet aDest( _pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj
+ SfxItemSet aDest( _pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
@@ -779,7 +779,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
if ( ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors)
|| ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) )
return _rEvt.mnAction;
-
+
const sal_Int8 nDropOption = ( OReportExchange::canExtract(rFlavors) ) ? DND_ACTION_COPYMOVE : DND_ACTION_NONE;
return nDropOption;
@@ -827,13 +827,13 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
if ( !bMultipleFormat )
{
::svx::ODataAccessDescriptor aDescriptor = ::svx::OColumnTransferable::extractColumnDescriptor(aDropped);
-
+
aValues.realloc(1);
aValues[0].Value <<= aDescriptor.createPropertyValueSequence();
} // if ( !bMultipleFormat )
- else
+ else
aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped);
-
+
beans::PropertyValue* pIter = aValues.getArray();
beans::PropertyValue* pEnd = pIter + aValues.getLength();
for(;pIter != pEnd; ++pIter)
@@ -846,7 +846,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
aCurrent.realloc(nLength + 3);
aCurrent[nLength].Name = PROPERTY_POSITION;
aCurrent[nLength++].Value <<= AWTPoint(aDropPos);
- // give also the DND Action (Shift|Ctrl) Key to really say what we want
+ // give also the DND Action (Shift|Ctrl) Key to really say what we want
aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction"));
aCurrent[nLength++].Value <<= _rEvt.mnAction;
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index cd9363e05d57..ddbeea74a9a9 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@
#include <toolkit/helper/vclunohelper.hxx>
-#define SECTION_OFFSET 3
+#define SECTION_OFFSET 3
namespace rptui
{
using namespace ::com::sun::star;
@@ -64,7 +64,7 @@ using namespace ::comphelper;
//==================================================================
DBG_NAME( rpt_OReportWindow )
//------------------------------------------------------------------------------
-OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)
+OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)
: Window(_pParent,WB_DIALOGCONTROL)
,m_aHRuler(this)
,m_pView(_pView)
@@ -78,7 +78,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)
m_aViewsWindow.Show();
- m_aHRuler.Show();
+ m_aHRuler.Show();
m_aHRuler.Activate();
m_aHRuler.SetPagePos(0);
m_aHRuler.SetBorders();
@@ -103,7 +103,7 @@ void OReportWindow::initialize()
//----------------------------------------------------------------------------
void OReportWindow::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType )
{
- m_aViewsWindow.SetInsertObj( eObj,_sShapeType);
+ m_aViewsWindow.SetInsertObj( eObj,_sShapeType);
}
//----------------------------------------------------------------------------
@@ -114,7 +114,7 @@ rtl::OUString OReportWindow::GetInsertObjString() const
//------------------------------------------------------------------------------
void OReportWindow::SetMode( DlgEdMode eNewMode )
{
- m_aViewsWindow.SetMode(eNewMode);
+ m_aViewsWindow.SetMode(eNewMode);
}
//----------------------------------------------------------------------------
void OReportWindow::removeSection(USHORT _nPosition)
@@ -129,9 +129,9 @@ void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSecti
{
if ( !_xSection.is() )
return;
-
- m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition);
-
+
+ m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition);
+
m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
}
//------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ void OReportWindow::toggleGrid(sal_Bool _bVisible)
void OReportWindow::showRuler(sal_Bool _bShow)
{
m_aHRuler.Show(_bShow);
-
+
m_aViewsWindow.showRuler(_bShow);
}
//------------------------------------------------------------------------------
@@ -157,7 +157,7 @@ sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const
}
//------------------------------------------------------------------------------
sal_Int32 OReportWindow::GetTotalWidth() const
-{
+{
sal_Int32 nWidth = 0;
if ( !m_aViewsWindow.empty() )
{
@@ -170,7 +170,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const
const Size aPageSize = LogicToPixel(Size(aPaperWidth,0));
nWidth = aPageSize.Width() + long(aStartWidth);
}
- return nWidth;
+ return nWidth;
}
//------------------------------------------------------------------------------
void OReportWindow::Resize()
@@ -200,12 +200,12 @@ void OReportWindow::Resize()
m_aHRuler.SetNullOffset(nLeftMargin);
m_aHRuler.SetMargin1(0);
m_aHRuler.SetMargin2(aPageSize.Width() - nLeftMargin - nRightMargin);
-
+
aStartPoint.Y() += aPageSize.Height();
nSectionsHeight -= aStartPoint.Y();
aStartPoint.X() = aOffset.X();
-
+
m_aViewsWindow.SetPosSizePixel(aStartPoint,Size(aTotalOutputSize.Width(),nSectionsHeight));
}
}
@@ -227,7 +227,7 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- ImplInitSettings();
+ ImplInitSettings();
Invalidate();
}
}
@@ -269,19 +269,19 @@ BOOL OReportWindow::HasSelection() const
//----------------------------------------------------------------------------
void OReportWindow::Delete()
{
-
+
m_aViewsWindow.Delete();
}
//----------------------------------------------------------------------------
void OReportWindow::Copy()
-{
-
+{
+
m_aViewsWindow.Copy();
}
//----------------------------------------------------------------------------
void OReportWindow::Paste()
{
-
+
m_aViewsWindow.Paste();
}
//----------------------------------------------------------------------------
@@ -292,13 +292,13 @@ BOOL OReportWindow::IsPasteAllowed() const
//-----------------------------------------------------------------------------
void OReportWindow::SelectAll(const sal_uInt16 _nObjectType)
{
-
+
m_aViewsWindow.SelectAll(_nObjectType);
}
//-----------------------------------------------------------------------------
void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView)
{
-
+
m_aViewsWindow.unmarkAllObjects(_pSectionView);
}
//-----------------------------------------------------------------------------
@@ -321,13 +321,13 @@ void OReportWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark)
//------------------------------------------------------------------------
void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
{
-
+
m_aViewsWindow.setMarked(_xSection,_bMark);
}
//------------------------------------------------------------------------
void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark)
{
-
+
m_aViewsWindow.setMarked(_xShape,_bMark);
}
//-----------------------------------------------------------------------------
@@ -341,33 +341,33 @@ void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepo
return m_aViewsWindow.getSectionWindow(_xSection);
}
// -------------------------------------------------------------------------
-void OReportWindow::markSection(const sal_uInt16 _nPos)
+void OReportWindow::markSection(const sal_uInt16 _nPos)
{
-
+
m_aViewsWindow.markSection(_nPos);
}
// -----------------------------------------------------------------------------
void OReportWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const
{
-
+
m_aViewsWindow.fillCollapsedSections(_rCollapsedPositions);
}
// -----------------------------------------------------------------------------
void OReportWindow::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections)
{
-
+
m_aViewsWindow.collapseSections(_aCollpasedSections);
}
// -----------------------------------------------------------------------------
void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects)
{
-
+
m_aViewsWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects);
}
// -----------------------------------------------------------------------------
void OReportWindow::setGridSnap(BOOL bOn)
{
-
+
m_aViewsWindow.setGridSnap(bOn);
}
// -----------------------------------------------------------------------------
@@ -388,13 +388,13 @@ void OReportWindow::zoom(const Fraction& _aZoom)
//setZoomFactor(_aZoom,*this); // if this will be include the H - ruler has the wrong size
m_aViewsWindow.zoom(_aZoom);
-
+
notifySizeChanged();
const Point aNewThumbPos( m_pParent->getThumbPos() );
ScrollChildren( aNewThumbPos );
Resize();
-
+
Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
}
// -----------------------------------------------------------------------------
@@ -437,10 +437,10 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const
break;
}
- return nZoom;
+ return nZoom;
}
//==================================================================
-} //rptui
+} //rptui
//==================================================================
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 82988a764f99..2f4429f72202 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -38,8 +38,8 @@
namespace rptui
{
-#define LINE_SIZE 50
-#define SECTION_OFFSET 3
+#define LINE_SIZE 50
+#define SECTION_OFFSET 3
#define SCR_LINE_SIZE 10
using namespace ::com::sun::star;
@@ -53,7 +53,7 @@ void lcl_setScrollBar(sal_Int32 _nNewValue,const Point& _aPos,const Size& _aSize
// -----------------------------------------------------------------------------
DBG_NAME( rpt_OScrollWindowHelper );
-OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
+OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
: OScrollWindowHelper_BASE( _pDesignView,WB_DIALOGCONTROL)
,OPropertyChangeListener(m_aMutex)
,m_aHScroll( this, WB_HSCROLL|WB_REPEAT|WB_DRAG )
@@ -65,7 +65,7 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
{
DBG_CTOR( rpt_OScrollWindowHelper,NULL);
SetMapMode( MapMode( MAP_100TH_MM ) );
-
+
impl_initScrollBar( m_aHScroll );
impl_initScrollBar( m_aVScroll );
@@ -96,7 +96,7 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const
//_rScrollBar.SetMapMode( MapMode( MAP_100TH_MM ) );
_rScrollBar.SetScrollHdl( LINK( this, OScrollWindowHelper, ScrollHdl ) );
- _rScrollBar.SetLineSize( SCR_LINE_SIZE );
+ _rScrollBar.SetLineSize( SCR_LINE_SIZE );
}
// -----------------------------------------------------------------------------
@@ -104,7 +104,7 @@ void OScrollWindowHelper::initialize()
{
uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController().getReportDefinition();
m_pReportDefintionMultiPlexer = addStyleListener(xReportDefinition,this);
-
+
m_aReportWindow.initialize();
}
//------------------------------------------------------------------------------
@@ -118,7 +118,7 @@ void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight)
long nWidth = long(_nWidth - (double)aStartWidth);
m_aHScroll.SetRangeMax( nWidth );
m_aVScroll.SetRangeMax( m_aTotalPixelSize.Height() );
-
+
Resize();
}
//------------------------------------------------------------------------------
@@ -134,14 +134,14 @@ Size OScrollWindowHelper::ResizeScrollBars()
const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize();
bool bVVisible = false; // by default no vertical-ScrollBar
bool bHVisible = false; // by default no horizontal-ScrollBar
- bool bChanged; // determines if a visiblility was changed
+ bool bChanged; // determines if a visiblility was changed
do
{
bChanged = false;
// does we need a vertical ScrollBar
if ( aOutPixSz.Width() < m_aTotalPixelSize.Width() && !bHVisible )
- {
+ {
bHVisible = true;
aOutPixSz.Height() -= nScrSize;
bChanged = true;
@@ -149,7 +149,7 @@ Size OScrollWindowHelper::ResizeScrollBars()
// does we need a horizontal ScrollBar
if ( aOutPixSz.Height() < m_aTotalPixelSize.Height() && !bVVisible )
- {
+ {
bVVisible = true;
aOutPixSz.Width() -= nScrSize;
bChanged = true;
@@ -175,7 +175,7 @@ Size OScrollWindowHelper::ResizeScrollBars()
const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MAP_APPFONT );
// resize scrollbars and set their ranges
- {
+ {
Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100);
const sal_Int32 nNewWidth = aOutPixSz.Width() - aOffset.X() - (long)aStartWidth;
lcl_setScrollBar(nNewWidth,Point( (long)aStartWidth + aOffset.X(), aOutPixSz.Height() ),Size( nNewWidth, nScrSize ),m_aHScroll);
@@ -250,7 +250,7 @@ void OScrollWindowHelper::Delete()
}
//----------------------------------------------------------------------------
void OScrollWindowHelper::Copy()
-{
+{
m_aReportWindow.Copy();
}
//----------------------------------------------------------------------------
@@ -314,7 +314,7 @@ void OScrollWindowHelper::setMarked(const uno::Sequence< uno::Reference< report:
return m_aReportWindow.getSectionWindow(_xSection);
}
// -------------------------------------------------------------------------
-void OScrollWindowHelper::markSection(const sal_uInt16 _nPos)
+void OScrollWindowHelper::markSection(const sal_uInt16 _nPos)
{
m_aReportWindow.markSection(_nPos);
}
@@ -332,19 +332,19 @@ void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star
long OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
{
const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent();
- if ( pCommandEvent &&
+ if ( pCommandEvent &&
( ((pCommandEvent->GetCommand() == COMMAND_WHEEL) ||
(pCommandEvent->GetCommand() == COMMAND_STARTAUTOSCROLL) ||
(pCommandEvent->GetCommand() == COMMAND_AUTOSCROLL))) )
- {
+ {
ScrollBar* pHScrBar = NULL;
ScrollBar* pVScrBar = NULL;
if ( m_aHScroll.IsVisible() )
pHScrBar = &m_aHScroll;
-
+
if ( m_aVScroll.IsVisible() )
pVScrBar = &m_aVScroll;
-
+
if ( HandleScrollCommand( *pCommandEvent, pHScrBar, pVScrBar ) )
return 1L;
}
@@ -371,7 +371,7 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- ImplInitSettings();
+ ImplInitSettings();
Invalidate();
}
}
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index b0c9a080ea3a..f47df1521b36 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O
OSectionView::~OSectionView()
{
- DBG_DTOR( rpt_OSectionView,NULL);
+ DBG_DTOR( rpt_OSectionView,NULL);
}
//----------------------------------------------------------------------------
@@ -73,7 +73,7 @@ void OSectionView::MarkListHasChanged()
{
DBG_CHKTHIS( rpt_OSectionView,NULL);
SdrView::MarkListHasChanged();
-
+
if ( m_pReportWindow && m_pSectionWindow && !m_pSectionWindow->getPage()->getSpecialMode() )
{
//m_pReportWindow->unmarkAllObjects(this); // WHY
@@ -183,8 +183,8 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo )
{
if (AreObjectsMarked())
{
- // #i11702# use SdrUndoObjectLayerChange for undo
- // STR_UNDO_SELATTR is "Attributes" - should use a different text later
+ // #i11702# use SdrUndoObjectLayerChange for undo
+ // STR_UNDO_SELATTR is "Attributes" - should use a different text later
BegUndo( );
const SdrMarkList& rMark = GetMarkedObjectList();
@@ -210,7 +210,7 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo )
EndUndo();
- // #84073# check mark list now instead of later in a timer
+ // #84073# check mark list now instead of later in a timer
CheckMarked();
MarkListHasChanged();
}
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 0a829c73f01e..7a72e6e075ac 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@
namespace rptui
{
-#define SECTION_OFFSET 3
+#define SECTION_OFFSET 3
using namespace ::com::sun::star;
using namespace ::comphelper;
@@ -78,8 +78,8 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep
m_aSplitter.SetEndSplitHdl(LINK(this, OSectionWindow,EndSplitHdl));
m_aSplitter.SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() ));
m_aSplitter.SetSplitPosPixel(m_aSplitter.LogicToPixel(Size(0,_xSection->getHeight())).Height());
-
-
+
+
m_aStartMarker.setCollapsedHdl(LINK(this,OSectionWindow,Collapsed));
m_aStartMarker.zoom(rMapMode.GetScaleX());
@@ -108,7 +108,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep
aEvent.Source = xGroup;
aEvent.PropertyName = PROPERTY_EXPRESSION;
}
-
+
_propertyChanged(aEvent);
SetPaintTransparent(TRUE);
}
@@ -125,7 +125,7 @@ OSectionWindow::~OSectionWindow()
}
catch (uno::Exception&)
{
- }
+ }
}
// -----------------------------------------------------------------------------
void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
@@ -152,7 +152,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
else if ( _rEvent.PropertyName.equals(PROPERTY_NAME) && !xSection->getGroup().is() )
{
uno::Reference< report::XReportDefinition > xReport = xSection->getReportDefinition();
- if ( setReportSectionTitle(xReport,RID_STR_REPORT_HEADER,::std::mem_fun(&OReportHelper::getReportHeader),::std::mem_fun(&OReportHelper::getReportHeaderOn))
+ if ( setReportSectionTitle(xReport,RID_STR_REPORT_HEADER,::std::mem_fun(&OReportHelper::getReportHeader),::std::mem_fun(&OReportHelper::getReportHeaderOn))
|| setReportSectionTitle(xReport,RID_STR_REPORT_FOOTER,::std::mem_fun(&OReportHelper::getReportFooter),::std::mem_fun(&OReportHelper::getReportFooterOn))
|| setReportSectionTitle(xReport,RID_STR_PAGE_HEADER,::std::mem_fun(&OReportHelper::getPageHeader),::std::mem_fun(&OReportHelper::getPageHeaderOn))
|| setReportSectionTitle(xReport,RID_STR_PAGE_FOOTER,::std::mem_fun(&OReportHelper::getPageFooter),::std::mem_fun(&OReportHelper::getPageFooterOn)) )
@@ -223,15 +223,15 @@ void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- ImplInitSettings();
+ ImplInitSettings();
Invalidate();
}
}
//------------------------------------------------------------------------------
void OSectionWindow::Resize()
{
- Window::Resize();
-
+ Window::Resize();
+
Size aOutputSize = GetOutputSizePixel();
Fraction aEndWidth(long(REPORT_ENDMARKER_WIDTH));
aEndWidth *= GetMapMode().GetScaleX();
@@ -246,9 +246,9 @@ void OSectionWindow::Resize()
m_aStartMarker.SetPosSizePixel(aPos,aOutputSize);
}
else
- {
+ {
const bool bShowEndMarker = m_pParent->getView()->GetTotalWidth() <= (aThumbPos.X() + aOutputSize.Width() );
-
+
Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= GetMapMode().GetScaleX();
@@ -331,13 +331,13 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, )
{
const String sEmpty(ModuleRes(RID_STR_UNDO_CHANGE_SIZE));
- getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String());
+ getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String());
return 0L;
}
//------------------------------------------------------------------------------
IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*, )
{
- getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction();
+ getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction();
/*getViewsWindow()->Resize();*/
return 0L;
}
@@ -351,12 +351,12 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel();
const Point aPos = _pSplitter->GetPosPixel();
-
+
const uno::Reference< report::XSection> xSection = m_aReportSection.getSection();
nSplitPos = m_aSplitter.PixelToLogic(Size(0,nSplitPos)).Height();
// nSplitPos = xSection->getHeight() + m_aSplitter.PixelToLogic(Size(0,nSplitPos - aPos.Y() )).Height();
-
+
const sal_Int32 nCount = xSection->getCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
@@ -404,10 +404,10 @@ void OSectionWindow::scrollChildren(long _nX)
//OWindowPositionCorrector aCorrector(&m_aReportSection,-aDelta.Width(),0);
lcl_scroll(m_aReportSection,aDiff);
}
-
+
//lcl_setOrigin(m_aEndMarker,_nDeltaX, 0);
lcl_scroll(m_aEndMarker,m_aEndMarker.PixelToLogic(Point(_nX,0)));
-
+
lcl_setOrigin(m_aSplitter,_nX, 0);
lcl_scroll(m_aSplitter,aDiff);
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index da2e56a178e8..0cd74a8988bd 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -42,18 +42,18 @@
#include <unotools/syslocale.hxx>
#include <svl/smplhint.hxx>
-#define CORNER_SPACE 5
+#define CORNER_SPACE 5
//=====================================================================
namespace rptui
{
//=====================================================================
-Image* OStartMarker::s_pDefCollapsed = NULL;
-Image* OStartMarker::s_pDefExpanded = NULL;
-Image* OStartMarker::s_pDefCollapsedHC = NULL;
-Image* OStartMarker::s_pDefExpandedHC = NULL;
-oslInterlockedCount OStartMarker::s_nImageRefCount = 0;
+Image* OStartMarker::s_pDefCollapsed = NULL;
+Image* OStartMarker::s_pDefExpanded = NULL;
+Image* OStartMarker::s_pDefCollapsedHC = NULL;
+Image* OStartMarker::s_pDefExpandedHC = NULL;
+oslInterlockedCount OStartMarker::s_nImageRefCount = 0;
DBG_NAME( rpt_OStartMarker )
// -----------------------------------------------------------------------------
@@ -89,7 +89,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol
// -----------------------------------------------------------------------------
OStartMarker::~OStartMarker()
{
- DBG_DTOR( rpt_OStartMarker,NULL);
+ DBG_DTOR( rpt_OStartMarker,NULL);
if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 )
{
DELETEZ(s_pDefCollapsed);
@@ -168,7 +168,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
{
if ( !rMEvt.IsLeft() )
return;
-
+
Point aPos( rMEvt.GetPosPixel());
const Size aOutputSize = GetOutputSizePixel();
@@ -178,7 +178,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
if ( rMEvt.GetClicks() == 2 || aRect.IsInside( aPos ) )
{
m_bCollapsed = !m_bCollapsed;
-
+
changeImage();
m_aVRuler.Show(!m_bCollapsed && m_bShowRuler);
@@ -209,7 +209,7 @@ void OStartMarker::initDefaultNodeImages()
s_pDefExpandedHC = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED_HC ) );
}
- Image* pImage = NULL;
+ Image* pImage = NULL;
if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
{
pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC;
@@ -236,7 +236,7 @@ void OStartMarker::ImplInitSettings()
void OStartMarker::Resize()
{
const Size aOutputSize( GetOutputSizePixel() );
- const long nOutputWidth = aOutputSize.Width();
+ const long nOutputWidth = aOutputSize.Width();
const long nOutputHeight = aOutputSize.Height();
const long nVRulerWidth = m_aVRuler.GetSizePixel().Width();
@@ -305,7 +305,7 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
}
// -----------------------------------------------------------------------------
void OStartMarker::setCollapsed(sal_Bool _bCollapsed)
-{
+{
OColorListener::setCollapsed(_bCollapsed);
showRuler(_bCollapsed);
changeImage();
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 8571adceb816..df456b102770 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -68,7 +68,7 @@ using namespace ::comphelper;
bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,SdrObject* _pObj,SdrView* _pView,sal_Int32 _nControlModification, bool _bBoundRects)
{
bool bMoveAllowed = _nXMov != 0 || _nYMov != 0;
- if ( bMoveAllowed )
+ if ( bMoveAllowed )
{
Rectangle aNewRect = _aObjRect;
SdrObject* pOverlappedObj = NULL;
@@ -87,7 +87,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd
break;
}
if ( dynamic_cast<OUnoObject*>(_pObj) )
- {
+ {
pOverlappedObj = isOver(aNewRect,*_pObj->GetPage(),*_pView,true,_pObj);
if ( pOverlappedObj && _pObj != pOverlappedObj )
{
@@ -97,7 +97,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd
switch(_nControlModification)
{
case ControlModification::LEFT:
- nXTemp += aOverlappingRect.Right() - aNewRect.Left();
+ nXTemp += aOverlappingRect.Right() - aNewRect.Left();
bMoveAllowed = _nXMov != nXTemp;
break;
case ControlModification::RIGHT:
@@ -164,7 +164,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd
default:
break;
}
-
+
_nXMov = nXTemp;
_nYMov = nYTemp;
}
@@ -179,7 +179,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd
// -----------------------------------------------------------------------------
DBG_NAME( rpt_OViewsWindow );
-OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
+OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
: Window( _pReportWindow,WB_DIALOGCONTROL)
,m_pParent(_pReportWindow)
,m_bInUnmark(sal_False)
@@ -202,7 +202,7 @@ OViewsWindow::~OViewsWindow()
// -----------------------------------------------------------------------------
void OViewsWindow::initialize()
{
-
+
}
// -----------------------------------------------------------------------------
void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet)
@@ -211,7 +211,7 @@ void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Poin
Size aSectionSize = _rSectionWindow.LogicToPixel( Size( 0,xSection->getHeight() ) );
aSectionSize.Width() = getView()->GetTotalWidth();
-
+
const sal_Int32 nMinHeight = _rSectionWindow.getStartMarker().getMinHeight();
if ( _rSectionWindow.getStartMarker().isCollapsed() || nMinHeight > aSectionSize.Height() )
{
@@ -241,7 +241,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
aStartPoint = pSectionWindow->GetPosPixel();
bSet = true;
} // if ( pSectionWindow.get() == &_rSectionWindow )
-
+
if ( bSet )
{
impl_resizeSectionWindow(*pSectionWindow.get(),aStartPoint,bSet);
@@ -255,18 +255,18 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
aOut.Width() = aStartWidth;
aOut = PixelToLogic(aOut);
m_pParent->notifySizeChanged();
-
+
Rectangle aRect(PixelToLogic(Point(0,0)),aOut);
Invalidate(aRect,INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
}
//------------------------------------------------------------------------------
void OViewsWindow::Resize()
{
- Window::Resize();
+ Window::Resize();
if ( !m_aSections.empty() )
{
const Point aOffset(m_pParent->getThumbPos());
- Point aStartPoint(0,-aOffset.Y());
+ Point aStartPoint(0,-aOffset.Y());
TSectionsMap::iterator aIter = m_aSections.begin();
TSectionsMap::iterator aEnd = m_aSections.end();
for (USHORT nPos=0;aIter != aEnd ; ++aIter,++nPos)
@@ -280,21 +280,21 @@ void OViewsWindow::Resize()
void OViewsWindow::Paint( const Rectangle& rRect )
{
Window::Paint( rRect );
-
+
Size aOut = GetOutputSizePixel();
Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= GetMapMode().GetScaleX();
aOut.Width() -= (long)aStartWidth;
aOut = PixelToLogic(aOut);
-
+
Rectangle aRect(PixelToLogic(Point(aStartWidth,0)),aOut);
Wallpaper aWall( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor );
DrawWallpaper(aRect,aWall);
}
//------------------------------------------------------------------------------
void OViewsWindow::ImplInitSettings()
-{
+{
// SetBackground( Wallpaper( COL_LIGHTBLUE ));
SetBackground( );
SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
@@ -330,7 +330,7 @@ void OViewsWindow::removeSection(USHORT _nPosition)
TSectionsMap::iterator aNew = getIteratorAtPos(_nPosition == 0 ? _nPosition+1: _nPosition - 1);
m_pParent->getReportView()->UpdatePropertyBrowserDelayed((*aNew)->getReportSection().getSectionView());
-
+
m_aSections.erase(aPos);
Resize();
} // if ( _nPosition < m_aSections.size() )
@@ -389,7 +389,7 @@ BOOL OViewsWindow::HasSelection() const
TSectionsMap::const_iterator aEnd = m_aSections.end();
for (;aIter != aEnd && !(*aIter)->getReportSection().getSectionView().AreObjectsMarked(); ++aIter)
;
- return aIter != aEnd;
+ return aIter != aEnd;
}
//----------------------------------------------------------------------------
void OViewsWindow::Delete()
@@ -416,7 +416,7 @@ void OViewsWindow::Copy()
}
//----------------------------------------------------------------------------
void OViewsWindow::Paste()
-{
+{
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(this));
OReportExchange::TSectionElements aCopies = OReportExchange::extractCopies(aTransferData);
if ( aCopies.getLength() > 1 )
@@ -445,7 +445,7 @@ void OViewsWindow::Paste()
break;
}
}
-
+
return pSectionWindow;
}
@@ -455,7 +455,7 @@ void OViewsWindow::Paste()
::boost::shared_ptr<OSectionWindow> pRet;
TSectionsMap::const_iterator aIter = m_aSections.begin();
TSectionsMap::const_iterator aEnd = m_aSections.end();
- sal_uInt32 nCurrentPosition = 0;
+ sal_uInt32 nCurrentPosition = 0;
for (; aIter != aEnd ; ++aIter)
{
if ( (*aIter)->getStartMarker().isMarked() )
@@ -464,7 +464,7 @@ void OViewsWindow::Paste()
{
pRet = (*aIter);
break;
- }
+ }
else if ( nsa == PREVIOUS )
{
if (nCurrentPosition > 0)
@@ -503,11 +503,11 @@ void OViewsWindow::Paste()
} // ( (*aIter).second->isMarked() )
++nCurrentPosition;
} // for (; aIter != aEnd ; ++aIter)
-
+
return pRet;
}
// -------------------------------------------------------------------------
-void OViewsWindow::markSection(const sal_uInt16 _nPos)
+void OViewsWindow::markSection(const sal_uInt16 _nPos)
{
if ( _nPos < m_aSections.size() )
m_pParent->setMarked(m_aSections[_nPos]->getReportSection().getSection(),sal_True);
@@ -547,10 +547,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
}
//-----------------------------------------------------------------------------
/*
-::boost::shared_ptr<OSectionWindow> OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection)
+::boost::shared_ptr<OSectionWindow> OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection)
{
OSL_ENSURE(_xSection.is(),"Section is NULL!");
- ::boost::shared_ptr<OSectionWindow> pRet;
+ ::boost::shared_ptr<OSectionWindow> pRet;
TSectionsMap::iterator aIter = m_aSections.begin();
TSectionsMap::iterator aEnd = m_aSections.end();
for (; aIter != aEnd ; ++aIter)
@@ -609,7 +609,7 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt )
for (aIter = m_aSections.begin();aIter != aEnd ; ++aIter)
{
(*aIter)->getReportSection().getPage()->resetSpecialMode();
- }
+ }
}
}
//------------------------------------------------------------------------------
@@ -676,7 +676,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor
bFirst = false;
m_pParent->setMarked(xSection,_bMark);
}
- ::boost::shared_ptr<OSectionWindow> pSectionWindow = getSectionWindow(xSection);
+ ::boost::shared_ptr<OSectionWindow> pSectionWindow = getSectionWindow(xSection);
if ( pSectionWindow )
{
SvxShape* pShape = SvxShape::getImplementation( *pIter );
@@ -700,7 +700,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles, bool _bBo
{
rView.SortMarkedObjects();
const sal_uInt32 nCount = rView.GetMarkedObjectCount();
- for (sal_uInt32 i=0; i < nCount; ++i)
+ for (sal_uInt32 i=0; i < nCount; ++i)
{
const SdrMark* pM = rView.GetSdrMarkByIndex(i);
SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -745,7 +745,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,
const SdrObject* pObj = aRectIter->second.first;
pObj->TakeObjInfo(aInfo);
BOOL bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect();
- if ( bHasFixed )
+ if ( bHasFixed )
_rBound.Union(aObjRect);
else
{
@@ -765,12 +765,12 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,
}
catch(uno::Exception){}
}
- }
- else
+ }
+ else
{
- if (_bBoundRects)
+ if (_bBoundRects)
_rBound.Union(aRectIter->second.second->GetMarkedObjBoundRect());
- else
+ else
_rBound.Union(aRectIter->second.second->GetMarkedObjRect());
}
}
@@ -784,7 +784,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
Point aRefPoint;
RectangleLess::CompareMode eCompareMode = RectangleLess::POS_LEFT;
- switch (_nControlModification)
+ switch (_nControlModification)
{
case ControlModification::TOP : eCompareMode = RectangleLess::POS_UPPER; break;
case ControlModification::BOTTOM: eCompareMode = RectangleLess::POS_DOWN; break;
@@ -793,7 +793,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
case ControlModification::CENTER_HORIZONTAL :
case ControlModification::CENTER_VERTICAL :
{
- eCompareMode = (ControlModification::CENTER_VERTICAL == _nControlModification) ? RectangleLess::POS_CENTER_VERTICAL : RectangleLess::POS_CENTER_HORIZONTAL;
+ eCompareMode = (ControlModification::CENTER_VERTICAL == _nControlModification) ? RectangleLess::POS_CENTER_VERTICAL : RectangleLess::POS_CENTER_HORIZONTAL;
uno::Reference<report::XSection> xSection = (*m_aSections.begin())->getReportSection().getSection();
uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition();
aRefPoint = Rectangle(getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN),0,
@@ -806,7 +806,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
RectangleLess aCompare(eCompareMode,aRefPoint);
TRectangleMap aSortRectangles(aCompare);
collectRectangles(aSortRectangles,_bBoundRects);
-
+
Rectangle aBound;
Rectangle aResize;
collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,_bBoundRects,aBound,aResize);
@@ -825,36 +825,36 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
Point aCenter(aBound.Center());
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if (aInfo.bMoveAllowed && !pObj->IsMoveProtect())
+ if (aInfo.bMoveAllowed && !pObj->IsMoveProtect())
{
long nXMov = 0;
long nYMov = 0;
long* pValue = &nXMov;
switch(_nControlModification)
{
- case ControlModification::TOP :
+ case ControlModification::TOP :
aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Top);
aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Bottom);
pValue = &nYMov;
break;
- case ControlModification::BOTTOM:
+ case ControlModification::BOTTOM:
// defaults are already set
pValue = &nYMov;
break;
- case ControlModification::CENTER_VERTICAL:
- nYMov = aCenter.Y() - aObjRect.Center().Y();
+ case ControlModification::CENTER_VERTICAL:
+ nYMov = aCenter.Y() - aObjRect.Center().Y();
pValue = &nYMov;
bMove = false;
break;
- case ControlModification::RIGHT :
+ case ControlModification::RIGHT :
aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Right);
aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Left);
break;
- case ControlModification::CENTER_HORIZONTAL:
+ case ControlModification::CENTER_HORIZONTAL:
nXMov = aCenter.X() - aObjRect.Center().X();
bMove = false;
break;
- case ControlModification::LEFT :
+ case ControlModification::LEFT :
aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Left);
aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Right);
break;
@@ -883,7 +883,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
if ( aInterSectRectIter == aRectIter )
*pValue = aGetFun(&aBound) - aGetFun(&aObjRect);
}
-
+
if ( lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,_bBoundRects) )
{
const Size aSize(nXMov,nYMov);
@@ -924,7 +924,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
}
}
break;
- default:
+ default:
break;
}
}
@@ -978,7 +978,7 @@ USHORT OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const
::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const USHORT _nPos) const
{
::boost::shared_ptr<OSectionWindow> aReturn;
-
+
if ( _nPos < m_aSections.size() )
aReturn = m_aSections[_nPos];
@@ -1013,12 +1013,12 @@ namespace
OSectionView& rView( _rhs->getReportSection().getSectionView() );
switch ( m_eAction )
{
- case eEndDragObj:
+ case eEndDragObj:
rView.EndDragObj( m_bCopy );
break;
case eEndAction:
- if ( rView.IsAction() )
- rView.EndAction ( );
+ if ( rView.IsAction() )
+ rView.EndAction ( );
break;
case eMoveAction:
rView.MovAction ( m_aPoint );
@@ -1030,11 +1030,11 @@ namespace
rView.ForceMarkedToAnotherPage();
break;
case eBreakAction:
- if ( rView.IsAction() )
- rView.BrkAction ( );
+ if ( rView.IsAction() )
+ rView.BrkAction ( );
break;
// default:
-
+
}
}
};
@@ -1057,11 +1057,11 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
OReportSection& rReportSection = (*aIter)->getReportSection();
rReportSection.getPage()->setSpecialMode();
OSectionView& rView = rReportSection.getSectionView();
-
+
if ( &rView != &_rSection )
{
// SdrRectObj *pNewObj = new SdrRectObj(OBJ_RECT, _aRect);
-// SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Temp Label")));
+// SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Temp Label")));
SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")));
if (pNewObj)
{
@@ -1093,7 +1093,7 @@ bool OViewsWindow::isObjectInMyTempList(SdrObject *_pObj)
// -----------------------------------------------------------------------------
void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection)
-{
+{
OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d\n", _aPnt.X(), _aPnt.Y() );
m_aBegDragTempList.clear();
@@ -1104,7 +1104,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
TSectionsMap::iterator aEnd = m_aSections.end();
for (; aIter != aEnd; ++aIter)
{
- OReportSection& rReportSection = (*aIter)->getReportSection();
+ OReportSection& rReportSection = (*aIter)->getReportSection();
OSectionView* pView = &rReportSection.getSectionView();
if (pView == _pSection)
break;
@@ -1126,13 +1126,13 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
{
OReportSection& rReportSection = (*aIter)->getReportSection();
-
+
OSectionView& rView = rReportSection.getSectionView();
-
+
if ( rView.AreObjectsMarked() )
{
const sal_uInt32 nCount = rView.GetMarkedObjectCount();
- for (sal_uInt32 i=0; i < nCount; ++i)
+ for (sal_uInt32 i=0; i < nCount; ++i)
{
const SdrMark* pM = rView.GetSdrMarkByIndex(i);
SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1145,10 +1145,10 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
aLeftTop.Y() = ::std::min( aRect.Top(), aLeftTop.Y() );
OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d\n", aRect.Left(), aRect.Top(), nViewCount );
-
+
BegDragObj_createInvisibleObjectAtPosition(aRect, rView);
-
- // calculate the clickpoint
+
+ // calculate the clickpoint
// const sal_Int32 nDeltaX = abs(aRect.Left() - aAbsolutePnt.X());
// const sal_Int32 nDeltaY = abs(aRect.Top() - aAbsolutePnt.Y());
// if (m_aDragDelta.X() > nDeltaX)
@@ -1156,7 +1156,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
// if (m_aDragDelta.Y() > nDeltaY)
// m_aDragDelta.Y() = nDeltaY;
}
- }
+ }
}
++nViewCount;
Rectangle aClipRect = rView.GetWorkArea();
@@ -1169,7 +1169,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
// don't subtract the height of the lines between the views
// aNewObjPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
}
-
+
const sal_Int32 nDeltaX = abs(aLeftTop.X() - aAbsolutePnt.X());
const sal_Int32 nDeltaY = abs(aLeftTop.Y() - aAbsolutePnt.Y());
m_aDragDelta.X() = nDeltaX;
@@ -1247,7 +1247,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection)
if ( &rReportSection.getSectionView() == _pSection )
{
bAdd = false;
- aNewPos = _aPnt; // 2,2
+ aNewPos = _aPnt; // 2,2
}
else if ( bAdd )
{
@@ -1376,7 +1376,7 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSe
aNewPos.X() = nLeftMargin;
if ( aNewPos.Y() < 0 )
aNewPos.Y() = 0;
-
+
Point aPrevious;
for (; pIter != pEnd; ++pIter)
{
@@ -1496,7 +1496,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
aPosForWorkArea.Y() += nSectionHeight;
// aNewPos.Y() += PixelToLogic(aIter->second.second->GetSizePixel()).Height();
}
-
+
for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
{
@@ -1628,7 +1628,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode)
SdrMark* pMark = rMarkList.GetMark(i);
bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL;
}
-
+
if ( bCheck && isOver(aMarkRect,*rReportSection.getPage(),rView) )
break;
}
@@ -1673,7 +1673,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode)
if ( bCheck )
aNewRect.Union(pMark->GetMarkedSdrObj()->GetLastBoundRect());
}
-
+
switch(pHdl->GetKind())
{
case HDL_LEFT:
@@ -1696,7 +1696,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode)
if ( !(bCheck && isOver(aNewRect,*rReportSection.getPage(),rView)) )
rView.MovAction(aEndPoint);
rView.EndDragObj();
-
+
// restore snap
if ( !bWasNoSnap )
((SdrDragStat&)rDragStat).SetNoSnap( bWasNoSnap );
@@ -1748,7 +1748,7 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>&
void OViewsWindow::zoom(const Fraction& _aZoom)
{
const MapMode& aMapMode = GetMapMode();
-
+
Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
if ( _aZoom < aMapMode.GetScaleX() )
aStartWidth *= aMapMode.GetScaleX();
@@ -1765,11 +1765,11 @@ void OViewsWindow::zoom(const Fraction& _aZoom)
} // for (;aIter != aEnd ; ++aIter)
Resize();
-
+
Size aOut = GetOutputSizePixel();
aOut.Width() = aStartWidth;
aOut = PixelToLogic(aOut);
-
+
Rectangle aRect(PixelToLogic(Point(0,0)),aOut);
Invalidate(aRect,/*INVALIDATE_NOERASE | */INVALIDATE_NOCHILDREN /*| INVALIDATE_TRANSPARENT*/);
}
@@ -1783,7 +1783,7 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos)
aMapMode.SetOrigin(m_pParent->GetMapMode().GetOrigin());
const Point aPosY(m_pParent->PixelToLogic(_aThumbPos,aMapMode));
-
+
aMapMode.SetOrigin( Point(aOld.X() , - aPosY.Y()));
SetMapMode( aMapMode );
//OWindowPositionCorrector aCorrector(this,0,-( aOld.Y() + aPosY.Y()));
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index b18c645aa18e..0b36df5c4672 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ void OReportExchange::AddSupportedFormats()
sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor )
{
const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
- return (nFormatId == getDescriptorFormatId()) ?
+ return (nFormatId == getDescriptorFormatId()) ?
SetAny( uno::Any(m_aCopyElements), _rFlavor )
: sal_False;
}
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index 1ca2e5cadbee..259191396d11 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -64,24 +64,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
{
case OBJ_DLG_FIXEDTEXT:
pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))
+ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))
,OBJ_DLG_FIXEDTEXT);
break;
case OBJ_DLG_IMAGECONTROL:
pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"))
+ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"))
,OBJ_DLG_IMAGECONTROL);
break;
case OBJ_DLG_FORMATTEDFIELD:
pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"))
+ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"))
,OBJ_DLG_FORMATTEDFIELD);
break;
case OBJ_DLG_VFIXEDLINE:
case OBJ_DLG_HFIXEDLINE:
{
OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel"))
+ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel"))
,pObjFactory->nIdentifier);
pObjFactory->pNewObj = pObj;
if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE )
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 10fdbce9a06e..ad0aa4a1803b 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -87,13 +87,13 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
OReportWindow* pReportWindow = m_pParent->getSectionWindow()->getViewsWindow()->getView();
OScrollWindowHelper* pScrollWindow = pReportWindow->getScrollWindow();
-
+
Size aOut = pReportWindow->GetOutputSizePixel();
Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= m_pParent->GetMapMode().GetScaleX();
aOut.Width() -= (long)aStartWidth;
-
+
Rectangle aOutRect( pScrollWindow->getThumbPos(), aOut );
aOutRect = m_pParent->PixelToLogic( aOutRect );
//Rectangle aWorkArea = m_pParent->getView()->GetWorkArea();
@@ -320,7 +320,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
else
m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
//m_rView.UnmarkAll();
-
+
deactivateOle(true);
bReturn = FALSE;
}
@@ -413,7 +413,7 @@ void DlgEdFunc::activateOle(SdrObject* _pObj)
{
const UINT16 nSdrObjKind = _pObj->GetObjIdentifier();
//
- // OLE: activate
+ // OLE: activate
//
if (nSdrObjKind == OBJ_OLE2)
{
@@ -533,7 +533,7 @@ bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt)
{
unColorizeOverlappedObj();
}
-
+
return bOverlapping;
}
// -----------------------------------------------------------------------------
@@ -614,11 +614,11 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
if (rDragStat.GetDragMethod() != NULL)
{
SdrObjListIter aIter(*m_pParent->getPage(),IM_DEEPNOGROUPS);
- SdrObject* pObjIter = NULL;
+ SdrObject* pObjIter = NULL;
// loop through all marked objects and check if there new rect overlapps an old one.
while( (pObjIter = aIter.Next()) != NULL && !bIsSetPoint)
{
- if ( m_rView.IsObjMarked(pObjIter)
+ if ( m_rView.IsObjMarked(pObjIter)
&& dynamic_cast<OUnoObject*>(pObjIter) != NULL )
{
Rectangle aNewRect = pObjIter->GetLastBoundRect();
@@ -633,8 +633,8 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
aNewRect.Move(nDx,nDy);
else
::ResizeRect(aNewRect,rDragStat.GetRef1(),rDragStat.GetXFact(),rDragStat.GetYFact());
-
-
+
+
SdrObject* pObjOverlapped = isOver(aNewRect,*m_pParent->getPage(),m_rView,false,pObjIter, ISOVER_IGNORE_CUSTOMSHAPES);
bIsSetPoint = pObjOverlapped ? true : false;
if (pObjOverlapped && !m_bSelectionMode)
@@ -731,7 +731,7 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView );
}
- return TRUE;
+ return TRUE;
}
//----------------------------------------------------------------------------
@@ -740,7 +740,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
if ( DlgEdFunc::MouseButtonUp( rMEvt ) )
return TRUE;
- const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
+ const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
const USHORT nHitLog = USHORT ( m_pParent->PixelToLogic(Size(3,0)).Width() );
BOOL bReturn = TRUE;
@@ -754,7 +754,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
m_rView.SetCreateMode( TRUE );
return TRUE;
}
-
+
m_rView.EndCreateObj(SDRCREATE_FORCEEND);
if ( !m_rView.AreObjectsMarked() )
@@ -781,7 +781,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
}
else
checkMovementAllowed(rMEvt);
-
+
if ( !m_rView.AreObjectsMarked() &&
Abs(m_aMDPos.X() - aPos.X()) < nHitLog &&
Abs(m_aMDPos.Y() - aPos.Y()) < nHitLog &&
@@ -803,7 +803,7 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
{
if ( DlgEdFunc::MouseMove(rMEvt ) )
return TRUE;
- Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
+ Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
if ( m_rView.IsCreateObj() )
{
@@ -856,7 +856,7 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
m_bSelectionMode = false;
if ( DlgEdFunc::MouseButtonDown(rMEvt) )
return TRUE;
-
+
SdrViewEvent aVEvt;
const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
if( eHit == SDRHIT_UNMARKEDOBJECT )
@@ -913,7 +913,7 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
checkTwoCklicks(rMEvt);
m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) );
-
+
if ( !m_bUiActive )
m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
m_bSelectionMode = false;
@@ -962,8 +962,8 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
bool bControlKey = rMEvt.IsMod1();
m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false, bControlKey);
}
- }
-
+ }
+
if ( !bIsSetPoint )
{
m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) );
@@ -978,141 +978,141 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
//void DlgEdFuncSelect::SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, BOOL bQuickDrag)
//{
//
-// SdrPageView* pPV = m_rView.GetSdrPageView();
-// if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() )
-// {
-// m_rView.SetCurrentObj(OBJ_TEXT);
-// m_rView.SetEditMode(SDREDITMODE_EDIT);
+// SdrPageView* pPV = m_rView.GetSdrPageView();
+// if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() )
+// {
+// m_rView.SetCurrentObj(OBJ_TEXT);
+// m_rView.SetEditMode(SDREDITMODE_EDIT);
//
-// BOOL bEmptyOutliner = FALSE;
+// BOOL bEmptyOutliner = FALSE;
//
-// if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner())
-// {
-// ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner();
-// ULONG nParaAnz = pOutl->GetParagraphCount();
-// Paragraph* p1stPara = pOutl->GetParagraph( 0 );
+// if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner())
+// {
+// ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner();
+// ULONG nParaAnz = pOutl->GetParagraphCount();
+// Paragraph* p1stPara = pOutl->GetParagraph( 0 );
//
-// if (nParaAnz==1 && p1stPara)
-// {
-// // Bei nur einem Pararaph
-// if (pOutl->GetText(p1stPara).Len() == 0)
-// {
-// bEmptyOutliner = TRUE;
-// }
-// }
-// }
+// if (nParaAnz==1 && p1stPara)
+// {
+// // Bei nur einem Pararaph
+// if (pOutl->GetText(p1stPara).Len() == 0)
+// {
+// bEmptyOutliner = TRUE;
+// }
+// }
+// }
//
-// if (_pTextObj != m_rView.GetTextEditObject() || bEmptyOutliner)
-// {
-// UINT32 nInv = _pTextObj->GetObjInventor();
-// UINT16 nSdrObjKind = _pTextObj->GetObjIdentifier();
+// if (_pTextObj != m_rView.GetTextEditObject() || bEmptyOutliner)
+// {
+// UINT32 nInv = _pTextObj->GetObjInventor();
+// UINT16 nSdrObjKind = _pTextObj->GetObjIdentifier();
//
-// if (nInv == SdrInventor && _pTextObj->HasTextEdit() &&
-// (nSdrObjKind == OBJ_TEXT ||
-// nSdrObjKind == OBJ_TITLETEXT ||
-// nSdrObjKind == OBJ_OUTLINETEXT ||
-// (_pTextObj->ISA(SdrTextObj) && !_pTextObj->IsEmptyPresObj())))
-// {
-// // Neuen Outliner machen (gehoert der SdrObjEditView)
+// if (nInv == SdrInventor && _pTextObj->HasTextEdit() &&
+// (nSdrObjKind == OBJ_TEXT ||
+// nSdrObjKind == OBJ_TITLETEXT ||
+// nSdrObjKind == OBJ_OUTLINETEXT ||
+// (_pTextObj->ISA(SdrTextObj) && !_pTextObj->IsEmptyPresObj())))
+// {
+// // Neuen Outliner machen (gehoert der SdrObjEditView)
// SdrModel* pModel = _pTextObj->GetModel();
// SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, pModel );
-// pOutl->SetMinDepth(0);
-// pOutl->SetStyleSheetPool((SfxStyleSheetPool*) pModel->GetStyleSheetPool());
-// //pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
-// ULONG nCntrl = pOutl->GetControlWord();
-// nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
-// nCntrl |= EE_CNTRL_URLSFXEXECUTE;
-// nCntrl |= EE_CNTRL_MARKFIELDS;
-// nCntrl |= EE_CNTRL_AUTOCORRECT;
+// pOutl->SetMinDepth(0);
+// pOutl->SetStyleSheetPool((SfxStyleSheetPool*) pModel->GetStyleSheetPool());
+// //pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
+// ULONG nCntrl = pOutl->GetControlWord();
+// nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
+// nCntrl |= EE_CNTRL_URLSFXEXECUTE;
+// nCntrl |= EE_CNTRL_MARKFIELDS;
+// nCntrl |= EE_CNTRL_AUTOCORRECT;
//
-// nCntrl &= ~EE_CNTRL_ULSPACESUMMATION;
-// //if ( pModel->IsSummationOfParagraphs() )
-// // nCntrl |= EE_CNTRL_ULSPACESUMMATION;
+// nCntrl &= ~EE_CNTRL_ULSPACESUMMATION;
+// //if ( pModel->IsSummationOfParagraphs() )
+// // nCntrl |= EE_CNTRL_ULSPACESUMMATION;
//
-// //SetSpellOptions( nCntrl );
+// //SetSpellOptions( nCntrl );
//
-// pOutl->SetControlWord(nCntrl);
+// pOutl->SetControlWord(nCntrl);
//
// uno::Reference< linguistic2::XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() );
-// if ( xSpellChecker.is() )
-// pOutl->SetSpeller( xSpellChecker );
+// if ( xSpellChecker.is() )
+// pOutl->SetSpeller( xSpellChecker );
//
// uno::Reference< linguistic2::XHyphenator > xHyphenator( LinguMgr::GetHyphenator() );
-// if( xHyphenator.is() )
-// pOutl->SetHyphenator( xHyphenator );
+// if( xHyphenator.is() )
+// pOutl->SetHyphenator( xHyphenator );
//
-// pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
+// pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
//
-// // in einem Gliederungstext darf nicht auf die 0-te
-// // Ebene ausgerueckt werden
-// if (_pTextObj->GetObjInventor() == SdrInventor &&
-// _pTextObj->GetObjIdentifier() == OBJ_OUTLINETEXT)
-// {
-// pOutl->SetMinDepth(1);
-// }
+// // in einem Gliederungstext darf nicht auf die 0-te
+// // Ebene ausgerueckt werden
+// if (_pTextObj->GetObjInventor() == SdrInventor &&
+// _pTextObj->GetObjIdentifier() == OBJ_OUTLINETEXT)
+// {
+// pOutl->SetMinDepth(1);
+// }
//
-// if (bEmptyOutliner)
-// {
-// m_rView.SdrEndTextEdit(sal_True);
-// }
+// if (bEmptyOutliner)
+// {
+// m_rView.SdrEndTextEdit(sal_True);
+// }
//
-// if( _pTextObj )
-// {
-// OutlinerParaObject* pOPO = _pTextObj->GetOutlinerParaObject();
-// if( ( pOPO && pOPO->IsVertical() ) /*||
-// nSlotId == SID_ATTR_CHAR_VERTICAL ||
-// nSlotId == SID_TEXT_FITTOSIZE_VERTICAL */)
-// pOutl->SetVertical( TRUE );
+// if( _pTextObj )
+// {
+// OutlinerParaObject* pOPO = _pTextObj->GetOutlinerParaObject();
+// if( ( pOPO && pOPO->IsVertical() ) /*||
+// nSlotId == SID_ATTR_CHAR_VERTICAL ||
+// nSlotId == SID_TEXT_FITTOSIZE_VERTICAL */)
+// pOutl->SetVertical( TRUE );
//
//
-// if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor)
-// {
-// //bFirstObjCreated = TRUE;
-// //DeleteDefaultText();
+// if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor)
+// {
+// //bFirstObjCreated = TRUE;
+// //DeleteDefaultText();
//
-// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView();
+// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView();
//
-// nSdrObjKind = _pTextObj->GetObjIdentifier();
+// nSdrObjKind = _pTextObj->GetObjIdentifier();
//
-// SdrViewEvent aVEvt;
-// SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
+// SdrViewEvent aVEvt;
+// SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
//
-// if (eHit == SDRHIT_TEXTEDIT)
-// {
-// // Text getroffen
-// if (nSdrObjKind == OBJ_TEXT ||
-// nSdrObjKind == OBJ_TITLETEXT ||
-// nSdrObjKind == OBJ_OUTLINETEXT ||
-// //nSlotId == SID_TEXTEDIT ||
-// !bQuickDrag)
-// {
-// pOLV->MouseButtonDown(rMEvt);
-// pOLV->MouseMove(rMEvt);
-// pOLV->MouseButtonUp(rMEvt);
-// }
+// if (eHit == SDRHIT_TEXTEDIT)
+// {
+// // Text getroffen
+// if (nSdrObjKind == OBJ_TEXT ||
+// nSdrObjKind == OBJ_TITLETEXT ||
+// nSdrObjKind == OBJ_OUTLINETEXT ||
+// //nSlotId == SID_TEXTEDIT ||
+// !bQuickDrag)
+// {
+// pOLV->MouseButtonDown(rMEvt);
+// pOLV->MouseMove(rMEvt);
+// pOLV->MouseButtonUp(rMEvt);
+// }
//
-// if ( bQuickDrag && _pTextObj->GetOutlinerParaObject())
-// {
-// pOLV->MouseButtonDown(rMEvt);
-// }
-// }
-// else
-// {
-// // #98198# Move cursor to end of text
-// ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
-// pOLV->SetSelection(aNewSelection);
-// }
-// }
-// else
-// {
-// //RestoreDefaultText();
-// }
-// }
-// }
-// }
-// }
-// else
-// _pTextObj = NULL;
+// if ( bQuickDrag && _pTextObj->GetOutlinerParaObject())
+// {
+// pOLV->MouseButtonDown(rMEvt);
+// }
+// }
+// else
+// {
+// // #98198# Move cursor to end of text
+// ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
+// pOLV->SetSelection(aNewSelection);
+// }
+// }
+// else
+// {
+// //RestoreDefaultText();
+// }
+// }
+// }
+// }
+// }
+// else
+// _pTextObj = NULL;
//}
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index ac36078ff3cf..5bfb868973f0 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -102,12 +102,12 @@ DBG_NAME( rpt_PropBrw )
//----------------------------------------------------------------------------
-PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParent,ODesignView* _pDesignView)
+PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParent,ODesignView* _pDesignView)
:DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE))
,m_xORB(_xORB)
,m_pDesignView(_pDesignView)
,m_pView( NULL )
- ,m_bInitialStateChange(sal_True)
+ ,m_bInitialStateChange(sal_True)
{
DBG_CTOR( rpt_PropBrw,NULL);
@@ -159,7 +159,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen
Reference< inspection::XObjectInspectorModel> xInspectorModel( bEnableHelpSection
? report::inspection::DefaultComponentInspectorModel::createWithHelpSection( m_xInspectorContext, 3, 8 )
: report::inspection::DefaultComponentInspectorModel::createDefault( m_xInspectorContext ) );
-
+
m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel);
if ( !m_xBrowserController.is() )
{
@@ -199,7 +199,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen
if (m_xBrowserComponentWindow.is())
{
-
+
m_xBrowserComponentWindow->setPosSize(0, 0, aPropWinSize.Width(), aPropWinSize.Height(),
awt::PosSize::WIDTH | awt::PosSize::HEIGHT | awt::PosSize::X | awt::PosSize::Y);
Resize();
@@ -235,9 +235,9 @@ PropBrw::~PropBrw()
DBG_DTOR( rpt_PropBrw,NULL);
}
// -----------------------------------------------------------------------------
-void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage)
-{
- m_sLastActivePage = _sLastActivePage;
+void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage)
+{
+ m_sLastActivePage = _sLastActivePage;
}
//----------------------------------------------------------------------------
@@ -311,7 +311,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr
{
sal_uInt32 nMarkCount = _rMarkList.GetMarkCount();
::std::vector< uno::Reference< uno::XInterface> > aSets;
- aSets.reserve(nMarkCount);
+ aSets.reserve(nMarkCount);
for(sal_uInt32 i=0;i<nMarkCount;++i)
{
@@ -352,7 +352,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface>
OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" );
}
- //Resize();
+ //Resize();
}
SetText( GetHeadlineName(_aObjects) );
}
@@ -583,7 +583,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
EndListening( *(m_pView->GetModel()) );
m_pView = NULL;
} // if ( m_pView )
-
+
uno::Reference< uno::XInterface> xTemp(CreateComponentPair(_xReportComponent,_xReportComponent));
implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) );
}
@@ -604,7 +604,7 @@ IMPL_LINK( PropBrw, OnAsyncGetFocus, void*, )
void PropBrw::LoseFocus()
{
DockingWindow::LoseFocus();
- m_pDesignView->getController().InvalidateAll();
+ m_pDesignView->getController().InvalidateAll();
}
//----------------------------------------------------------------------------
}
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 4a84f7bd034d..536579d7fb7b 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -353,13 +353,13 @@ Menu RID_MENU_REPORT
};
MenuItem
{
- Identifier = SID_ARRANGEMENU ;
- HelpID = SID_ARRANGEMENU ;
- Command = ".uno:ArrangeMenu" ;
- Text [ en-US ] = "~Arrange" ;
+ Identifier = SID_ARRANGEMENU ;
+ HelpID = SID_ARRANGEMENU ;
+ Command = ".uno:ArrangeMenu" ;
+ Text [ en-US ] = "~Arrange" ;
SubMenu = Menu
{
- ItemList =
+ ItemList =
{
MenuItem
{
@@ -367,13 +367,13 @@ Menu RID_MENU_REPORT
};
MenuItem
{
- Identifier = SID_FRAME_UP ;
- HelpID = SID_FRAME_UP ;
+ Identifier = SID_FRAME_UP ;
+ HelpID = SID_FRAME_UP ;
Text [ en-US ] = "Bring ~Forward" ;
};
MenuItem
{
- Identifier = SID_FRAME_DOWN ;
+ Identifier = SID_FRAME_DOWN ;
HelpID = SID_FRAME_DOWN ;
Text [ en-US ] = "Send Back~ward" ;
};
@@ -401,7 +401,7 @@ Menu RID_MENU_REPORT
ITEM_FORMAT_OBJECT_ALIGN
SubMenu = Menu
{
- ItemList =
+ ItemList =
{
MenuItem
{
@@ -441,14 +441,14 @@ Menu RID_MENU_REPORT
MenuItem
{
- Identifier = SID_OBJECT_RESIZING ;
- Command = ".uno:ObjectResize" ;
- HelpID = SID_OBJECT_RESIZING ;
+ Identifier = SID_OBJECT_RESIZING ;
+ Command = ".uno:ObjectResize" ;
+ HelpID = SID_OBJECT_RESIZING ;
Text [ en-US ] = "~Object Resizing" ;
- Text [ x-comment ] = " ";
+ Text [ x-comment ] = " ";
SubMenu = Menu
{
- ItemList =
+ ItemList =
{
MenuItem
{
@@ -496,14 +496,14 @@ Menu RID_MENU_REPORT
};
MenuItem
{
- Identifier = SID_SECTION_SHRINK_MENU ;
- Command = ".uno:SectionShrinkMenu" ;
- HelpID = SID_SECTION_SHRINK_MENU ;
+ Identifier = SID_SECTION_SHRINK_MENU ;
+ Command = ".uno:SectionShrinkMenu" ;
+ HelpID = SID_SECTION_SHRINK_MENU ;
Text [ en-US ] = "Section" ;
- Text [ x-comment ] = " ";
+ Text [ x-comment ] = " ";
SubMenu = Menu
{
- ItemList =
+ ItemList =
{
MenuItem
{
generated by cgit (git 2.34.1) at 2024-06-29 15:25:06 +0000