summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2010-11-27 01:51:28 +0900
committerDavid Tardon <dtardon@redhat.com>2010-11-26 19:30:41 +0100
commit44e1703066cae6c5c7371594d20ec4a85cf1b326 (patch)
tree982cf7281b03383b275605574ee6dfac3be36f4c /reportdesign
parent90d6d9e390f6f6a0349ea126cff90c6923bad76d (diff)
Remove dead codes and confusing comments
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx18
-rw-r--r--reportdesign/source/ui/report/FixedTextColor.cxx68
-rw-r--r--reportdesign/source/ui/report/FormattedFieldBeautifier.cxx1
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx142
-rw-r--r--reportdesign/source/ui/report/ReportControllerObserver.cxx35
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx24
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx5
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx2
-rw-r--r--reportdesign/source/ui/report/SectionView.cxx3
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx25
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx10
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx111
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx190
-rw-r--r--reportdesign/source/ui/report/makefile.mk1
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx7
15 files changed, 88 insertions, 554 deletions
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 3e97c4e0f002..ebcb1615e417 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -171,14 +171,11 @@ ODesignView::ODesignView( Window* pParent,
// now create the task pane on the right side :-)
m_pTaskPane = new OTaskWindow(this);
- //m_pTaskPane->Show();
m_aSplitWin.InsertItem( COLSET_ID,100,SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE | SWIB_COLSET );
- m_aSplitWin.InsertItem( REPORT_ID, &m_aScrollWindow, 100/*m_aScrollWindow.getMaxMarkerWidth(sal_False)*/, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE /*SWIB_COLSET*/);
- //m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
+ m_aSplitWin.InsertItem( REPORT_ID, &m_aScrollWindow, 100, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE);
// Splitter einrichten
- //m_aSplitter.SetSplitHdl(LINK(this, ODesignView,SplitHdl));
m_aSplitWin.SetSplitHdl(LINK(this, ODesignView,SplitHdl));
m_aSplitWin.ShowAutoHideButton();
m_aSplitWin.SetAlign(WINDOWALIGN_LEFT);
@@ -249,7 +246,6 @@ long ODesignView::PreNotify( NotifyEvent& rNEvt )
switch(rNEvt.GetType())
{
case EVENT_KEYINPUT:
- //if ( nRet != 1L )
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
if ( handleKeyEvent(*pKeyEvent) )
@@ -291,7 +287,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
nSplitPos = static_cast<sal_Int32>(_rPlayground.Right() - nMinWidth);
getController().setSplitPos(nSplitPos);
}
- } // if ( 0 != _rPlaygroundSize.Width() )
+ }
Size aReportWindowSize(aPlaygroundSize);
if ( m_aSplitWin.IsItemValid(TASKPANE_ID) )
@@ -530,12 +526,10 @@ void ODesignView::togglePropertyBrowser(sal_Bool _bToogleOn)
m_pTaskPane->Invalidate();
if ( bWillBeVisible )
- m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE/*|SWIB_COLSET */);
+ m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE);
else
m_aSplitWin.RemoveItem(TASKPANE_ID);
- // TRY
- // Invalidate(/*INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE*/);
if ( bWillBeVisible )
m_aMarkTimer.Start();
}
@@ -619,12 +613,6 @@ uno::Reference< report::XSection > ODesignView::getCurrentSection() const
if ( m_pCurrentView )
xSection = m_pCurrentView->getReportSection()->getSection();
- // why do we need the code below?
- //else
- // {
- // OReportController& rReportController = getController();
- // xSection = rReportController.getReportDefinition()->getDetail();
- // }
return xSection;
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 67c6829b75ec..bd0e4ee1a412 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -69,69 +69,6 @@ namespace rptui
}
//--------------------------------------------------------------------
- // sal_Int32 FixedTextColor::getTextColor()
- // {
- // const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings();
- // BOOL bHighContrast = aStyleSettings.GetHighContrastMode();
- //
- // Color aGetFaceColor = aStyleSettings.GetFaceColor();
- // Color aGetCheckedColor = aStyleSettings.GetCheckedColor();
- // Color aGetLightColor = aStyleSettings.GetLightColor();
- // Color aGetLightBorderColor = aStyleSettings.GetLightBorderColor();
- // Color aGetShadowColor = aStyleSettings.GetShadowColor();
- // Color aGetDarkShadowColor = aStyleSettings.GetDarkShadowColor();
- // Color aGetButtonTextColor = aStyleSettings.GetButtonTextColor();
- // Color aGetButtonRolloverTextColor = aStyleSettings.GetButtonRolloverTextColor();
- // Color aGetRadioCheckTextColor = aStyleSettings.GetRadioCheckTextColor();
- // Color aGetGroupTextColor = aStyleSettings.GetGroupTextColor();
- // Color aGetLabelTextColor = aStyleSettings.GetLabelTextColor();
- // Color aGetInfoTextColor = aStyleSettings.GetInfoTextColor();
- // Color aGetWindowColor = aStyleSettings.GetWindowColor();
- // Color aGetWindowTextColor = aStyleSettings.GetWindowTextColor();
- // Color aGetDialogColor = aStyleSettings.GetDialogColor();
- // Color aGetDialogTextColor = aStyleSettings.GetDialogTextColor();
- // Color aGetWorkspaceColor = aStyleSettings.GetWorkspaceColor();
- // Color aGetFieldColor = aStyleSettings.GetFieldColor();
- // Color aGetFieldTextColor = aStyleSettings.GetFieldTextColor();
- // Color aGetFieldRolloverTextColor = aStyleSettings.GetFieldRolloverTextColor();
- // Color aGetActiveColor = aStyleSettings.GetActiveColor();
- // Color aGetActiveColor2 = aStyleSettings.GetActiveColor2();
- // Color aGetActiveTextColor = aStyleSettings.GetActiveTextColor();
- // Color aGetActiveBorderColor = aStyleSettings.GetActiveBorderColor();
- // Color aGetDeactiveColor = aStyleSettings.GetDeactiveColor();
- // Color aGetDeactiveColor2 = aStyleSettings.GetDeactiveColor2();
- // Color aGetDeactiveTextColor = aStyleSettings.GetDeactiveTextColor();
- // Color aGetDeactiveBorderColor = aStyleSettings.GetDeactiveBorderColor();
- // Color aGetHighlightColor = aStyleSettings.GetHighlightColor();
- // Color aGetHighlightTextColor = aStyleSettings.GetHighlightTextColor();
- // Color aGetDisableColor = aStyleSettings.GetDisableColor();
- // Color aGetHelpColor = aStyleSettings.GetHelpColor();
- // Color aGetHelpTextColor = aStyleSettings.GetHelpTextColor();
- // Color aGetMenuColor = aStyleSettings.GetMenuColor();
- // Color aGetMenuBarColor = aStyleSettings.GetMenuBarColor();
- // Color aGetMenuBorderColor = aStyleSettings.GetMenuBorderColor();
- // Color aGetMenuTextColor = aStyleSettings.GetMenuTextColor();
- // Color aGetMenuHighlightColor = aStyleSettings.GetMenuHighlightColor();
- // Color aGetMenuHighlightTextColor = aStyleSettings.GetMenuHighlightTextColor();
- // Color aGetLinkColor = aStyleSettings.GetLinkColor();
- // Color aGetVisitedLinkColor = aStyleSettings.GetVisitedLinkColor();
- // Color aGetHighlightLinkColor = aStyleSettings.GetHighlightLinkColor();
- // Color aGetMonoColor = aStyleSettings.GetMonoColor();
- // Color aGetActiveTabColor = aStyleSettings.GetActiveTabColor();
- // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor();
- //
- // Color aWindowColor = aStyleSettings.GetWindowColor();
- // Color aLabelColor = aStyleSettings.GetLabelTextColor();
- //
- // // if (m_nTextColor == -1)
- // // {
- // // svtools::ExtendedColorConfig aConfig;
- // // m_nTextColor = aConfig.GetColorValue(CFG_REPORTDESIGNER, DBTEXTBOXBOUNDCONTENT).getColor();
- // // }
- // return aLabelColor.GetColor();
- // }
-
- //--------------------------------------------------------------------
FixedTextColor::~FixedTextColor()
{
DBG_DTOR(rpt_FixedTextColor,NULL);
@@ -140,7 +77,6 @@ namespace rptui
void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent )
{
- // (void)_rEvent;
uno::Reference< report::XFixedText > xFixedText( _rEvent.Source, uno::UNO_QUERY );
if ( ! xFixedText.is() )
{
@@ -151,9 +87,6 @@ namespace rptui
{
uno::Reference< lang::XComponent > xComponent( xFixedText, uno::UNO_QUERY_THROW );
handle(xComponent);
- // uno::Reference<awt::XVclWindowPeer> xVclWindowPeer = getVclWindowPeer(xComponent);
-
- // setPropertyTextColor(xVclWindowPeer, getTextColor());
}
catch (uno::Exception e)
{
@@ -176,7 +109,6 @@ namespace rptui
// -----------------------------------------------------------------------------
void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement )
{
- // (void) _rxElement;
uno::Reference< report::XFixedText > xFixedText( _rxElement, uno::UNO_QUERY );
if ( ! xFixedText.is() )
{
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 4cb76497d7f8..6abe034897b6 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -187,7 +187,6 @@ namespace rptui
OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObject);
if ( pUnoObj ) // this doesn't need to be done for shapes
{
- // Rectangle aRect = pUnoObj->GetCurrentBoundRect();
::boost::shared_ptr<OSectionWindow> pSectionWindow = m_rReportController.getSectionWindow(xSection);
if (pSectionWindow != NULL)
{
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 2c1eff9637a7..6275f2fa4e01 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -194,11 +194,11 @@ namespace
{
bool operator() (const beans::PropertyValue& x, const ::rtl::OUString& y) const
{
- return x.Name.equals(y);// ? true : false;
+ return x.Name.equals(y);
}
bool operator() (const ::rtl::OUString& x,const beans::PropertyValue& y) const
{
- return x.equals(y.Name);// ? true : false;
+ return x.equals(y.Name);
}
};
@@ -230,7 +230,7 @@ namespace
catch(beans::UnknownPropertyException&)
{
}
- } // if ( xReportControlFormat.is() )
+ }
}
}
@@ -246,12 +246,11 @@ void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
SequenceAsHashMap aMap(aArgs);
xReportControlFormat = aMap.getUnpackedValueOrDefault(REPORTCONTROLFORMAT,uno::Reference< report::XReportControlFormat>());
_xWindow = aMap.getUnpackedValueOrDefault(CURRENT_WINDOW,uno::Reference< awt::XWindow>());
- } // if ( aArgs.getLength() )
+ }
if ( !xReportControlFormat.is() )
{
_pView->fillControlModelSelection(_rControlsFormats);
- //xReportControlFormat.set( _pView->getCurrentControlModel(),uno::UNO_QUERY);
- } // if ( !xReportControlFormat.is() )
+ }
else
_rControlsFormats.push_back(xReportControlFormat);
@@ -340,7 +339,7 @@ void OReportController::disposing()
m_pClipbordNotifier->AddRemoveListener( getView(), sal_False );
m_pClipbordNotifier->release();
m_pClipbordNotifier = NULL;
- } // if ( getView() && m_pClipbordNotifier )
+ }
if ( m_pGroupsFloater )
{
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) );
@@ -392,7 +391,6 @@ void OReportController::disposing()
OReportController_BASE::disposing();
- // disconnect();
try
{
m_xReportDefinition.clear();
@@ -466,7 +464,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
case SID_OBJECT_SMALLESTHEIGHT:
case SID_OBJECT_GREATESTWIDTH:
case SID_OBJECT_GREATESTHEIGHT:
- aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();// && getDesignView()->isAlignPossible();
+ aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();
if ( aReturn.bEnabled )
aReturn.bEnabled = m_nSelectionCount > 1;
break;
@@ -528,7 +526,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
case SID_SECTION_ALIGN_UP:
case SID_SECTION_ALIGN_MIDDLE:
case SID_SECTION_ALIGN_DOWN:
- aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();// && getDesignView()->isAlignPossible();
+ aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();
break;
case SID_CUT:
aReturn.bEnabled = isEditable() && getDesignView()->HasSelection() && !getDesignView()->isHandleEvent(_nId);
@@ -843,7 +841,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
break;
default:
;
- } // switch(_nCommand)
+ }
}
break;
case SID_ATTR_CHAR_COLOR:
@@ -888,7 +886,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
aReturn.bChecked = _nId == SID_ATTR_PARA_ADJUST_CENTER;
break;
}
- } // if ( aReturn.aValue >>= nParaAdjust )
+ }
aReturn.aValue.clear();
}
break;
@@ -898,7 +896,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
break;
case SID_CHAR_DLG:
case SID_SETCONTROLDEFAULTS:
- aReturn.bEnabled = m_xReportDefinition.is() && isEditable();// && getDesignView()->getCurrentControlModel().is();
+ aReturn.bEnabled = m_xReportDefinition.is() && isEditable();
if ( aReturn.bEnabled )
{
::std::vector< uno::Reference< uno::XInterface > > aSelection;
@@ -935,7 +933,6 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
SvxZoomItem aZoom(m_eZoomType,m_nZoomValue);
aZoom.SetValueSet(SVX_ZOOM_ENABLE_50|SVX_ZOOM_ENABLE_75|SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_200);
aZoom.QueryValue(aReturn.aValue);
- //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue);
}
break;
case SID_ATTR_ZOOMSLIDER:
@@ -947,7 +944,6 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
aZoomSlider.AddSnappingPoint(100);
aZoomSlider.AddSnappingPoint(200);
aZoomSlider.QueryValue(aReturn.aValue);
- //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue);
}
break;
default:
@@ -1055,7 +1051,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
case SID_REDO:
case SID_UNDO:
{
- // const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() );
// We would like to know if we are in undo mode
const OXUndoEnvironment::OUndoMode aLock( m_aReportModel->GetUndoEnv() );
OReportController_BASE::Execute( _nId, aArgs );
@@ -1169,7 +1164,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
select(uno::makeAny(m_xReportDefinition));
break;
case SID_EXECUTE_REPORT:
- /*m_nExecuteReportEvent = */getView()->PostUserEvent(LINK(this, OReportController,OnExecuteReport));
+ getView()->PostUserEvent(LINK(this, OReportController,OnExecuteReport));
break;
case SID_RPT_NEW_FUNCTION:
createNewFunction(aArgs[0].Value);
@@ -1223,14 +1218,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
InvalidateAll();
break;
case SID_INSERT_DIAGRAM:
- /*{
- OSectionView* pView = getCurrentSectionView();
- if ( pView )
- {
- Reference< awt::XWindow> xWindow = VCLUnoHelper::GetInterface(getView()->Window::GetParent());
- InsertChart(m_xContext,m_xReportDefinition.get(),xWindow,pView,getSdrModel().get());
- }
- }*/
getDesignView()->SetMode( RPTUI_INSERT );
getDesignView()->SetInsertObj( OBJ_OLE2);
createDefaultControl(aArgs);
@@ -1409,7 +1396,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
case SID_DRAWTBX_CS_STAR:
sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("star5"));
break;
- case SID_DRAWTBX_CS_BASIC:
default:
sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond"));
}
@@ -1517,7 +1503,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
if ( aArgs[0].Value >>= aFont )
{
impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARFONTNAME,uno::makeAny(aFont.Name),aArgs);
- } // if ( aArgs[0].Value >>= aFont )
+ }
}
break;
case SID_ATTR_CHAR_FONTHEIGHT:
@@ -1548,7 +1534,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
case SID_ATTR_PARA_ADJUST_BLOCK:
eParagraphAdjust = style::ParagraphAdjust_BLOCK;
break;
- } // switch(_nId)
+ }
impl_setPropertyAtControls_throw(RID_STR_UNDO_ALIGNMENT,PROPERTY_PARAADJUST,uno::makeAny(eParagraphAdjust),aArgs);
InvalidateFeature(SID_ATTR_PARA_ADJUST_LEFT);
@@ -1575,16 +1561,14 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT));
pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction));
rptui::openCharDialog(xFormat,xWindow,aSettings);
- } // if ( !pListAction.get() )
+ }
applyCharacterSettings( xFormat, aSettings );
}
- } // for(; aIter != aControlsFormats.end();++aIter)
+ }
if ( !aControlsFormats.empty() )
InvalidateAll();
}
break;
- //case SID_FM_DESIGN_MODE:
- // break;
case SID_INSERT_GRAPHIC:
insertGraphic();
break;
@@ -1610,7 +1594,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
}
else
createDateTime(aArgs);
- } // if ( m_xReportDefinition.is() )
+ }
break;
case SID_INSERT_FLD_PGNUMBER:
if ( m_xReportDefinition.is() )
@@ -1622,7 +1606,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
}
else
createPageNumber(aArgs);
- } // if ( m_xReportDefinition.is() )
+ }
break;
case SID_EXPORTDOC:
case SID_EXPORTDOCASPDF:
@@ -1648,7 +1632,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
}
}
setEditable(!isEditable());
- //getJoinView()->setReadOnly(!isEditable());
InvalidateAll();
return;
case SID_GROUP:
@@ -1665,7 +1648,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
m_nZoomValue = aZoomItem.GetValue();
m_eZoomType = aZoomItem.GetType();
impl_zoom_nothrow();
- } // if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("Zoom") )
+ }
break;
case SID_ATTR_ZOOMSLIDER:
if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("ZoomSlider") )
@@ -1702,7 +1685,6 @@ 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
getSdrModel();
@@ -1732,11 +1714,11 @@ void OReportController::impl_initialize( )
m_xReportDefinition->setCommand(aNames[0]);
m_xReportDefinition->setCommandType(sdb::CommandType::TABLE);
}
- } // if ( !sHierarchicalDocumentName.getLength() && getConnection().is() )
+ }
m_aVisualAreaSize = m_xReportDefinition->getVisualAreaSize(0);
- } // if ( m_xReportDefinition.is() )
+ }
// check if chart is supported by the engine
checkChartEnabled();
@@ -1774,7 +1756,7 @@ void OReportController::impl_initialize( )
getDesignView()->setCurrentPage(m_sLastActivePage);
uno::Sequence< beans::PropertyValue> aArgs;
executeUnChecked(SID_SELECT_REPORT,aArgs);
- } // if ( m_bShowProperties && m_nPageNum == -1 )
+ }
setModified(sal_False); // and we are not modified yet
@@ -1790,7 +1772,6 @@ void OReportController::impl_initialize( )
// -----------------------------------------------------------------------------
IMPL_LINK( OReportController, OnOpenHelpAgent, void* ,/*_pMemfun*/)
{
- //m_nExecuteReportEvent = 0;
doOpenHelpAgent();
return 0L;
}
@@ -1814,8 +1795,6 @@ void OReportController::doOpenHelpAgent()
{
rtl::OUString suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"));
openHelpAgent(suURL);
- // openHelpAgent(68245 /* HID_REPORT_DESIGN... UNKNOWN */ );
- // HID_APP_REPORT_TREE
}
else
{
@@ -1838,7 +1817,6 @@ sal_Bool OReportController::Construct(Window* pParent)
m_pClipbordNotifier->AddRemoveListener( getView(), sal_True );
OReportController_BASE::Construct(pParent);
- //getView()->Show();
return sal_True;
}
// -----------------------------------------------------------------------------
@@ -1866,7 +1844,6 @@ void OReportController::describeSupportedFeatures()
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 );
@@ -1880,13 +1857,11 @@ void OReportController::describeSupportedFeatures()
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 );
@@ -2168,7 +2143,7 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _
_xLayoutManager->createElement( s_sMenu[i] );
_xLayoutManager->requestElement( s_sMenu[i] );
}
- } // if ( _xLayoutManager.is() )
+ }
}
// -----------------------------------------------------------------------------
void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _bShow)
@@ -2314,7 +2289,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven
/// TODO: check what we need to notify here TitleHelper
/*else if ( evt.PropertyName.equals( PROPERTY_CAPTION ) )
updateTitle();*/
- } // if ( evt.Source == m_xReportDefinition )
+ }
else
{
uno::Reference< report::XGroup> xGroup(evt.Source,uno::UNO_QUERY);
@@ -2359,7 +2334,6 @@ USHORT lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xG
// -----------------------------------------------------------------------------
void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const ::rtl::OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow)
{
- //adjustSectionName(_xGroup,_nGroupPos);
::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn);
::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader);
::rtl::OUString sColor(DBGROUPHEADER);
@@ -2651,7 +2625,6 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS
return;
}
const sal_Int32 nSectionHeight = _xSection->getHeight();
- // sal_Int32 nMinPositionY = nSectionHeight;
sal_Int32 nMaxPositionY = 0;
uno::Reference< report::XReportComponent> xReportComponent;
@@ -2662,7 +2635,6 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS
const sal_Int32 nReportComponentPositionY = xReportComponent->getPositionY();
const sal_Int32 nReportComponentHeight = xReportComponent->getHeight();
const sal_Int32 nReportComponentPositionYAndHeight = nReportComponentPositionY + nReportComponentHeight;
- // nMinPositionY = std::min(nReportComponentPositionY, nMinPositionY);
nMaxPositionY = std::max(nReportComponentPositionYAndHeight, nMaxPositionY);
}
// now we know the minimal Y-Position and maximal Y-Position
@@ -2686,7 +2658,6 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect
const sal_Int32 nSectionHeight = _xSection->getHeight();
sal_Int32 nMinPositionY = nSectionHeight;
- // sal_Int32 nMaxPositionY = 0;
uno::Reference< report::XReportComponent> xReportComponent;
// for every component get it's Y-position and compare it to the current Y-position
@@ -2694,10 +2665,7 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect
{
xReportComponent.set(_xSection->getByIndex(i), uno::UNO_QUERY);
const sal_Int32 nReportComponentPositionY = xReportComponent->getPositionY();
- // const sal_Int32 nReportComponentHeight = xReportComponent->getHeight();
- // const sal_Int32 nReportComponentPositionYAndHeight = nReportComponentPositionY + nReportComponentHeight;
nMinPositionY = std::min(nReportComponentPositionY, nMinPositionY);
- // nMaxPositionY = std::max(nReportComponentPositionYAndHeight, nMaxPositionY);
}
// now we know the minimal Y-Position and maximal Y-Position
if (nMinPositionY == 0)
@@ -2770,7 +2738,7 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept
else if ( aFeatureState.aValue.hasValue() )
pIter->Value = aFeatureState.aValue;
- } // for (; pIter != pEnd; ++pIter)
+ }
uno::Sequence<beans::PropertyValue> aProps(1);
aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandProperties"));
@@ -2804,8 +2772,8 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept
aProps.realloc( nCount + 1 );
aProps[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MarkedSection"));
aProps[nCount].Value <<= (sal_Int32)pSectionWindow->getReportSection().getPage()->GetPageNum();
- } // if ( pSectionWindow.get() )
- } // if ( getDesignView() )
+ }
+ }
const sal_Int32 nCount = aProps.getLength();
aProps.realloc( nCount + 1 );
aProps[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomFactor"));
@@ -2979,7 +2947,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
{
const String suSQLContext = String( ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT ) );
aInfo.prepend(suSQLContext);
- } // if (aInfo.isValid())
+ }
m_bInGeneratePreview = false;
}
@@ -3152,7 +3120,6 @@ void OReportController::createNewFunction(const uno::Any& _aValue)
// -----------------------------------------------------------------------------
IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/)
{
- //m_nExecuteReportEvent = 0;
executeReport();
return 0L;
}
@@ -3185,7 +3152,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
sCustomShapeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond"));
pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl);
pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width
- } // if ( _nObjectId == OBJ_CUSTOMSHAPE )
+ }
else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId )
{
pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() );
@@ -3229,7 +3196,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
{
if ( xInfo->hasPropertyByName(sProps[i]) && xShapeInfo->hasPropertyByName(sProps[i]) )
xUnoProp->setPropertyValue(sProps[i],xShapeProp->getPropertyValue(sProps[i]));
- } // for(size_t i = 0; i < SAL_N_ELEMENTS(sProps);++i)
+ }
if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) )
xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER));
@@ -3311,7 +3278,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
{
uno::Sequence< beans::PropertyValue > aArgs;
executeChecked(SID_PAGEHEADERFOOTER,aArgs);
- } // if ( !m_xHoldAlive->getPageHeaderOn() )
+ }
SequenceAsHashMap aMap(_aArgs);
sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False);
@@ -3380,7 +3347,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
// LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down
sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")), sal_Int8(0));
pSectionWindow[1] = pSectionWindow[0];
- // ::boost::shared_ptr<OReportSection> pReportSectionPost;
sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY;
if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK )
{
@@ -3414,7 +3380,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
{
xReportDefinition->setCommand(sCommand);
xReportDefinition->setCommandType(nCommandType);
- } // if ( !xReportDefinition->getCommand().getLength() )
+ }
xColumns = dbtools::getFieldsByCommandDescriptor(xConnection,nCommandType,sCommand,xHoldAlive);
if ( xColumns.is() && xColumns->hasByName(sColumnName) )
@@ -3490,7 +3456,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
SdrUnoObj* pControl[2];
pControl[0] = NULL;
pControl[1] = NULL;
- //getDesignView()->GetModel()->GetUndoEnv().Lock();
const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_RIGHTMARGIN);
const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE).Width - nRightMargin;
OSectionView* pSectionViews[2];
@@ -3502,7 +3467,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
,xField,xNumberFormats,nOBJID,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT,
pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(),
pControl[0],pControl[1]);
- //getDesignView()->GetModel()->GetUndoEnv().UnLock();
if ( pControl[0] && pControl[1] )
{
SdrPageView* pPgViews[2];
@@ -3542,15 +3506,12 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
ReportFormula aFormula( ReportFormula::Field, sName );
xUnoProp->setPropertyValue( PROPERTY_DATAFIELD, uno::makeAny( aFormula.getCompleteFormula() ) );
- } // if ( xInfo->hasPropertyByName(PROPERTY_DATAFIELD) )
+ }
if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) )
xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER));
pObjs[i]->CreateMediator(sal_True);
- // need SectionView from the above or follow Section
- // (getMarkedSection) returns the current Section
- //pSectionViews[i]->InsertObjectAtView(pControl[i],*pPgViews[i],SDRINSERT_ADDMARK);
const sal_Int32 nShapeWidth = xShapeProp->getWidth();
const bool bChangedPos = (aPos.X + nShapeWidth) > nPaperWidth;
@@ -3568,8 +3529,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
if (pSectionViews[0] != pSectionViews[1] &&
nOBJID == OBJ_DLG_FORMATTEDFIELD) // we want this nice feature only at FORMATTEDFIELD
{
- // we have two different Views, so set the position x new.
- // pSectionViews[1].position.x = pSectionViews[0].position.x
uno::Reference< report::XReportComponent> xShapePropLabel(pObjs[0]->getUnoShape(),uno::UNO_QUERY_THROW);
uno::Reference< report::XReportComponent> xShapePropTextField(pObjs[1]->getUnoShape(),uno::UNO_QUERY_THROW);
if ( sLabel.getLength() )
@@ -3639,11 +3598,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
xTextfield->setPositionY(aTextfield.Top());
}
}
- // this should never happen.
- // else
- // {
- // DBG_ERROR("unhandled case.");
- // }
}
}
}
@@ -3735,11 +3689,6 @@ void OReportController::listen(const bool _bAdd)
// Add Listeners to ReportControllerObserver
OXReportControllerObserver& rObserver = *m_pReportControllerObserver;
- // void (OXReportControllerObserver::*pObserverFunction)( const uno::Reference< uno::XInterface >& ) =
- // _bAdd ? &OXReportControllerObserver::AddElement : &OXReportControllerObserver::RemoveElement;
-
- // (rObserver.*pObserverFunction)( m_xReportDefinition->getStyleFamilies() );
- // (rObserver.*pObserverFunction)( m_xReportDefinition->getFunctions() );
if ( m_xReportDefinition->getPageHeaderOn() && _bAdd )
{
@@ -3770,7 +3719,7 @@ void OReportController::listen(const bool _bAdd)
getDesignView()->addSection(xGroup->getHeader(),DBGROUPHEADER);
rObserver.AddSection(xGroup->getHeader());
}
- } // for (sal_Int32 i=0;i<nCount ; ++i)
+ }
if ( _bAdd )
{
@@ -3885,7 +3834,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId)
,bSwitchOn ? Inserted : Removed
,0
));
- } // if ( SID_PAGEHEADERFOOTER == _nId )
+ }
switch( _nId )
{
case SID_PAGEHEADER_WITHOUT_UNDO:
@@ -4164,11 +4113,11 @@ void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty
{
_rState.bEnabled = sal_False;
}
- } // for(; aIter != aSelection.end();++aIter)
+ }
if ( aIter == aSelection.end() )
_rState.aValue = aTemp;
}
- } // if ( _rState.bEnabled )
+ }
}
// -----------------------------------------------------------------------------
void OReportController::impl_zoom_nothrow()
@@ -4176,8 +4125,6 @@ void OReportController::impl_zoom_nothrow()
Fraction aZoom(m_nZoomValue,100);
setZoomFactor( aZoom,*getDesignView() );
getDesignView()->zoom(aZoom);
- // TRY
- /*getDesignView()->Invalidate(INVALIDATE_NOCHILDREN);*/
InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(),sal_True);
InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(),sal_True);
}
@@ -4204,7 +4151,7 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un
break;
default:
;
- } // switch(_nCommand)
+ }
}
catch(uno::Exception&)
{
@@ -4227,11 +4174,11 @@ bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndo
{
const String sUndoAction = String(ModuleRes(_nUndoResId));
pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction));
- } // if ( !pListAction.get() )
+ }
const uno::Reference< beans::XPropertySet > xControlModel(*aIter,uno::UNO_QUERY);
if ( xControlModel.is() )
xControlModel->setPropertyValue(_sProperty,_aValue);
- } // for(; aIter != aSelection.end();++aIter)
+ }
return !aSelection.empty();
}
// -----------------------------------------------------------------------------
@@ -4298,7 +4245,7 @@ void OReportController::openZoomDialog()
m_nZoomValue = getDesignView()->getZoomFactor( m_eZoomType );
impl_zoom_nothrow();
- } // if ( !bCancel )
+ }
}
catch(uno::Exception&)
{
@@ -4308,7 +4255,7 @@ void OReportController::openZoomDialog()
for (sal_uInt16 i=0; i < SAL_N_ELEMENTS(pDefaults); ++i)
delete pDefaults[i];
- } // if(pFact)
+ }
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
@@ -4316,15 +4263,12 @@ void OReportController::openZoomDialog()
void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException)
{
::osl::MutexGuard aGuard( getMutex() );
- //if( nAspect == embed::Aspects::MSOLE_CONTENT )
- {
bool bChanged =
(m_aVisualAreaSize.Width != _aSize.Width ||
m_aVisualAreaSize.Height != _aSize.Height);
m_aVisualAreaSize = _aSize;
if( bChanged )
setModified( sal_True );
- }
m_nAspect = _nAspect;
}
// -----------------------------------------------------------------------------
@@ -4357,7 +4301,7 @@ embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepres
{
xTransfer->setVisualAreaSize(m_nAspect,m_aVisualAreaSize);
aResult = xTransfer->getPreferredVisualRepresentation( _nAspect );
- } // if ( xTransfer.is() )
+ }
}
catch( uno::Exception & ex )
{
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 45c389f94bef..ce0427728d20 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -50,8 +50,6 @@ namespace rptui
using namespace ::com::sun::star;
- // const OReportController *& m_pReportController;
-
DECLARE_STL_USTRINGACCESS_MAP(bool, AllProperties);
DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache);
@@ -111,31 +109,6 @@ public:
if ( _pEvt )
{
sal_Int32 nEvent = _pEvt->GetId();
- /*
- // just for debug
- if (nEvent == VCLEVENT_WINDOW_CHILDCREATED ||
- nEvent == VCLEVENT_WINDOW_PAINT ||
- nEvent == VCLEVENT_WINDOW_MOVE ||
- nEvent == VCLEVENT_WINDOW_RESIZE ||
- nEvent == VCLEVENT_WINDOW_SHOW ||
- nEvent == VCLEVENT_WINDOW_MOUSEMOVE ||
- nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED ||
- nEvent == VCLEVENT_WINDOW_HIDE ||
- nEvent == VCLEVENT_EDIT_MODIFY ||
- nEvent == VCLEVENT_SCROLLBAR_ENDSCROLL ||
- nEvent == VCLEVENT_EDIT_SELECTIONCHANGED ||
- nEvent == VCLEVENT_TABPAGE_INSERTED ||
- nEvent == VCLEVENT_TABPAGE_REMOVED ||
- nEvent == VCLEVENT_TOOLBOX_FORMATCHANGED ||
- nEvent == VCLEVENT_TOOLBOX_ITEMADDED ||
- nEvent == VCLEVENT_TOOLBOX_ALLITEMCHANGED ||
- nEvent == VCLEVENT_MENUBARADDED ||
- nEvent == 1
- )
- {
- return 0L;
- }
- */
if (nEvent == VCLEVENT_APPLICATION_DATACHANGED )
{
@@ -146,8 +119,6 @@ public:
{
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();
@@ -200,7 +171,6 @@ public:
void OXReportControllerObserver::Clear()
{
OEnvLock aLock(*this);
- // sal_uInt32 nDebugValue = m_pImpl->m_aSections.size();
m_pImpl->m_aSections.clear();
}
@@ -316,7 +286,6 @@ void OXReportControllerObserver::switchListening( const uno::Reference< containe
// be notified of any changes in the container elements
uno::Reference< container::XContainer > xSimpleContainer( _rxContainer, uno::UNO_QUERY );
- // OSL_ENSURE( xSimpleContainer.is(), "OXReportControllerObserver::switchListening: how are we expected to be notified of changes in the container?" );
if ( xSimpleContainer.is() )
{
if ( _bStartListening )
@@ -368,17 +337,13 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn
//------------------------------------------------------------------------------
void SAL_CALL OXReportControllerObserver::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException)
{
- // implSetModified();
}
//------------------------------------------------------------------------------
void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterface >& _rxElement )
{
- // if ( !IsLocked() )
- // {
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 );
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 1294e97da483..f2a09d924a64 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -122,7 +122,6 @@ OReportSection::~OReportSection()
{
DBG_DTOR( rpt_OReportSection,NULL);
m_pPage = NULL;
- //m_pModel->GetUndoEnv().RemoveSection(m_xSection.get());
if ( m_pMulti.is() )
m_pMulti->dispose();
@@ -136,7 +135,6 @@ OReportSection::~OReportSection()
m_pView->EndListening( *m_pModel );
m_pView = NULL;
}
- /*m_pModel->DeletePage(m_pPage->GetPageNum());*/
}
//------------------------------------------------------------------------------
void OReportSection::Paint( const Rectangle& rRect )
@@ -247,7 +245,6 @@ void OReportSection::fill()
m_pView->SetDesignMode( TRUE );
m_pView->StartListening( *m_pModel );
- /*Resize();*/
if ( m_xSection.is() && m_pPage && m_pView )
{
uno::Reference<report::XReportDefinition> xReportDefinition = m_xSection->getReportDefinition();
@@ -256,9 +253,7 @@ void OReportSection::fill()
const sal_Int32 nWorkAreaLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN);
const sal_Int32 nWorkAreaRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN);
m_pView->SetWorkArea( Rectangle( Point( nWorkAreaLeftMargin, 0), Size(aPageSize.Width() - nWorkAreaLeftMargin - nWorkAreaRightMargin,aPageSize.Height()) ) );
- } // if ( m_xSection.is() && m_pPage && m_pView )
-
- //SetBackground( Wallpaper( COL_BLUE ));
+ }
}
// -----------------------------------------------------------------------------
void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyCopiedObjects,bool _bForce)
@@ -309,7 +304,6 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
{
aRet.Move(0,aRet.getHeight()+1);
pNeuObj->SetLogicRect(aRet);
- //(*pCopiesIter)->setPositionY(aRet.Top());
}
}
m_pView->AddUndo( m_pView->GetModel()->GetSdrUndoFactory().CreateUndoNewObject( *pNeuObj ) );
@@ -368,9 +362,6 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
if( !m_pView->AreObjectsMarked() || !m_xSection.is() )
return;
- // stop all drawing actions
- //m_pView->BrkAction();
-
// insert control models of marked objects into clipboard dialog model
const SdrMarkList& rMarkedList = m_pView->GetMarkedObjectList();
const ULONG nMark = rMarkedList.GetMarkCount();
@@ -403,7 +394,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
OSL_ENSURE(0,"Can't copy report elements!");
}
}
- } // for( ULONG i = 0; i < nMark; i++ )
+ }
if ( !aCopies.empty() )
{
@@ -496,7 +487,7 @@ void lcl_insertMenuItemImages(
rContextMenu.CheckItem(nId,rController.isCommandChecked(nId));
rContextMenu.EnableItem(nId,rController.isCommandEnabled(nId));
}
- } // for (USHORT i = 0; i < nCount; ++i)
+ }
}
//----------------------------------------------------------------------------
void OReportSection::Command( const CommandEvent& _rCEvt )
@@ -609,7 +600,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
}
pBase->StartListening();
}
- } // for (sal_Int32 i = 0; i < nCount; ++i)
+ }
}
catch(uno::Exception)
{
@@ -634,7 +625,7 @@ void OReportSection::deactivateOle()
// -----------------------------------------------------------------------------
void OReportSection::createDefault(const ::rtl::OUString& _sType)
{
- SdrObject* pObj = m_pView->GetCreateObj();//rMarkList.GetMark(0)->GetObj();
+ SdrObject* pObj = m_pView->GetCreateObj();
if ( !pObj )
return;
createDefault(_sType,pObj);
@@ -809,8 +800,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
nDropOption = DND_ACTION_COPYMOVE;
m_pParent->getViewsWindow()->BrkAction();
m_pParent->getViewsWindow()->unmarkAllObjects(m_pView);
- //m_pParent->getViewsWindow()->getView()->setMarked(m_pView,sal_True);
- } // if ( OReportExchange::canExtract(rFlavors) )
+ }
else if ( bMultipleFormat
|| ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) )
{
@@ -832,7 +822,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
aValues.realloc(1);
aValues[0].Value <<= aDescriptor.createPropertyValueSequence();
- } // if ( !bMultipleFormat )
+ }
else
aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped);
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index cd9363e05d57..d3b2dfeb2afb 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -122,7 +122,6 @@ void OReportWindow::removeSection(USHORT _nPosition)
m_aViewsWindow.removeSection(_nPosition);
m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
m_aViewsWindow.Invalidate(INVALIDATE_TRANSPARENT);
- //Resize();
}
//----------------------------------------------------------------------------
void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,USHORT _nPosition)
@@ -163,7 +162,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const
{
Fraction aStartWidth(long(REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH ));
const Fraction aZoom(m_pView->getController().getZoomValue(),100);
- aStartWidth *= aZoom; // m_aViewsWindow.GetMapMode().GetScaleX();;
+ aStartWidth *= aZoom;
const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width;
Fraction aPaperWidth(nPaperWidth,1);
aPaperWidth *= aZoom;
@@ -248,7 +247,6 @@ void OReportWindow::ScrollChildren(const Point& _aThumbPos)
m_aHRuler.Scroll(-(aOrg.X() + _aThumbPos.X()),0);
}
- /*const Point aPos(PixelToLogic(_aThumbPos));*/
m_aViewsWindow.scrollChildren(_aThumbPos);
}
//----------------------------------------------------------------------------
@@ -386,7 +384,6 @@ void OReportWindow::zoom(const Fraction& _aZoom)
m_aHRuler.SetZoom(_aZoom);
m_aHRuler.Invalidate();
- //setZoomFactor(_aZoom,*this); // if this will be include the H - ruler has the wrong size
m_aViewsWindow.zoom(_aZoom);
notifySizeChanged();
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 82988a764f99..98a48bf1c5eb 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -93,7 +93,6 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const
aStyle.SetDragFullOptions( aStyle.GetDragFullOptions() | DRAGFULL_OPTION_SCROLL ); // live scrolling
aSettings.SetStyleSettings( aStyle );
_rScrollBar.SetSettings( aSettings );
- //_rScrollBar.SetMapMode( MapMode( MAP_100TH_MM ) );
_rScrollBar.SetScrollHdl( LINK( this, OScrollWindowHelper, ScrollHdl ) );
_rScrollBar.SetLineSize( SCR_LINE_SIZE );
@@ -359,7 +358,6 @@ void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,boo
void OScrollWindowHelper::ImplInitSettings()
{
SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() ));
- // SetBackground( Wallpaper( COL_LIGHTRED ));
SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
}
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index b0c9a080ea3a..fd7bc528d55d 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -76,7 +76,6 @@ void OSectionView::MarkListHasChanged()
if ( m_pReportWindow && m_pSectionWindow && !m_pSectionWindow->getPage()->getSpecialMode() )
{
- //m_pReportWindow->unmarkAllObjects(this); // WHY
DlgEdHint aHint( RPTUI_HINT_SELECTIONCHANGED );
m_pReportWindow->getReportView()->Broadcast( aHint );
m_pReportWindow->getReportView()->UpdatePropertyBrowserDelayed(*this);
@@ -230,7 +229,7 @@ bool OSectionView::OnlyShapesMarked() const
{
break;
}
- } // for (ULONG i=0; i<nCount; i++)
+ }
return i == nCount;
}
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 0a829c73f01e..8ea1240b3bae 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -145,9 +145,6 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
m_aEndMarker.Invalidate(INVALIDATE_NOERASE);
m_aReportSection.Invalidate(/*INVALIDATE_NOERASE*/);
getViewsWindow()->getView()->getReportView()->getController().resetZoomType();
- // Invalidate(INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
- // m_pParent->Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE|INVALIDATE_TRANSPARENT);
- // m_pParent->Invalidate(/*INVALIDATE_NOCHILDREN | INVALIDATE_NOERASE |*/ INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
}
else if ( _rEvent.PropertyName.equals(PROPERTY_NAME) && !xSection->getGroup().is() )
{
@@ -164,7 +161,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
}
}
- } // if ( xSection.is() )
+ }
else if ( _rEvent.PropertyName.equals(PROPERTY_EXPRESSION) )
{
uno::Reference< report::XGroup > xGroup(_rEvent.Source,uno::UNO_QUERY);
@@ -185,7 +182,7 @@ bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReport
String sTitle = String(ModuleRes(_nResId));
m_aStartMarker.setTitle(sTitle);
m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
- } // if ( bRet )
+ }
return bRet;
}
// -----------------------------------------------------------------------------
@@ -206,14 +203,13 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>&
sTitle.SearchAndReplace('#',sExpression);
m_aStartMarker.setTitle(sTitle);
m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
- } // if ( _pIsSectionOn(&aGroupHelper) )
+ }
return bRet;
}
//------------------------------------------------------------------------------
void OSectionWindow::ImplInitSettings()
{
SetBackground( );
- //SetBackground( Wallpaper( COL_RED ));
}
//-----------------------------------------------------------------------------
void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
@@ -309,8 +305,6 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
m_pParent->resize(*this);
Resize();
- // TRY
- // m_pParent->Invalidate(INVALIDATE_TRANSPARENT | INVALIDATE_NOCHILDREN);
Invalidate();
}
return 0L;
@@ -324,8 +318,7 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
setZoomFactor(_aZoom,m_aReportSection);
setZoomFactor(_aZoom,m_aSplitter);
setZoomFactor(_aZoom,m_aEndMarker);
- //Resize();
- Invalidate(/*INVALIDATE_UPDATE |*/ /* | INVALIDATE_TRANSPARENT *//*INVALIDATE_NOCHILDREN*/);
+ Invalidate();
}
//-----------------------------------------------------------------------------
IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, )
@@ -338,7 +331,6 @@ IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, )
IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*, )
{
getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction();
- /*getViewsWindow()->Resize();*/
return 0L;
}
//-----------------------------------------------------------------------------
@@ -355,17 +347,16 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
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)
{
uno::Reference<report::XReportComponent> xReportComponent(xSection->getByIndex(i),uno::UNO_QUERY);
- if ( xReportComponent.is() /*&& nSplitPos < (xReportComponent->getPositionY() + xReportComponent->getHeight())*/ )
+ if ( xReportComponent.is() )
{
nSplitPos = ::std::max(nSplitPos,xReportComponent->getPositionY() + xReportComponent->getHeight());
}
- } // for (sal_Int32 i = 0; i < nCount; ++i)
+ }
if ( nSplitPos < 0 )
nSplitPos = 0;
@@ -378,7 +369,7 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
// -----------------------------------------------------------------------------
void lcl_scroll(Window& _rWindow,const Point& _aDelta)
{
- _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y()/*,SCROLL_CHILDREN*//*|SCROLL_CLIP*/);
+ _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y());
_rWindow.Invalidate(INVALIDATE_TRANSPARENT);
}
// -----------------------------------------------------------------------------
@@ -401,11 +392,9 @@ void OSectionWindow::scrollChildren(long _nX)
const Point aNew = aMapMode.GetOrigin();
const Point aDiff = aOld - aNew;
{
- //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);
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 90dcb4a5ab92..d3bee52d4970 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -92,7 +92,7 @@ OStartMarker::~OStartMarker()
{
DELETEZ(s_pDefCollapsed);
DELETEZ(s_pDefExpanded);
- } // if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 )
+ }
}
// -----------------------------------------------------------------------------
sal_Int32 OStartMarker::getMinHeight() const
@@ -105,7 +105,6 @@ sal_Int32 OStartMarker::getMinHeight() const
void OStartMarker::Paint( const Rectangle& rRect )
{
Window::Paint( rRect );
- //SetUpdateMode(FALSE);
Size aSize = GetOutputSizePixel();
long nSize = aSize.Width();
const long nCornerWidth = long(CORNER_SPACE * (double)GetMapMode().GetScaleX());
@@ -113,10 +112,10 @@ void OStartMarker::Paint( const Rectangle& rRect )
if ( !isCollapsed() )
{
const long nVRulerWidth = m_aVRuler.GetSizePixel().Width();
- nSize = aSize.Width() - nVRulerWidth/* - m_nCornerSize*/;
+ nSize = aSize.Width() - nVRulerWidth;
SetClipRegion(Region(PixelToLogic(Rectangle(Point(),Size( nSize,aSize.Height())))));
aSize.Width() += nCornerWidth;
- } // if ( !isCollapsed() )
+ }
else
SetClipRegion();
@@ -209,7 +208,6 @@ void OStartMarker::initDefaultNodeImages()
// -----------------------------------------------------------------------
void OStartMarker::ImplInitSettings()
{
- // SetBackground( Wallpaper( COL_YELLOW ));
SetBackground( );
SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
setColor();
@@ -255,7 +253,6 @@ void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
== SFX_HINT_COLORS_CHANGED))
{
setColor();
- //m_aText.Invalidate();
Invalidate(INVALIDATE_CHILDREN);
}
}
@@ -272,7 +269,6 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
{
// Hilfe anzeigen
Rectangle aItemRect(rHEvt.GetMousePosPixel(),Size(GetSizePixel().Width(),getMinHeight()));
- //aItemRect = LogicToPixel( aItemRect );
Point aPt = OutputToScreenPixel( aItemRect.TopLeft() );
aItemRect.Left() = aPt.X();
aItemRect.Top() = aPt.Y();
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 8571adceb816..e27a806740e4 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -240,7 +240,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
{
aStartPoint = pSectionWindow->GetPosPixel();
bSet = true;
- } // if ( pSectionWindow.get() == &_rSectionWindow )
+ }
if ( bSet )
{
@@ -248,7 +248,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
pSectionWindow->Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
pSectionWindow->getStartMarker().Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT );
}
- } // for (;aIter != aEnd ; ++aIter,++nPos)
+ }
Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= GetMapMode().GetScaleX();
Size aOut = GetOutputSizePixel();
@@ -269,11 +269,11 @@ void OViewsWindow::Resize()
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)
+ for (;aIter != aEnd ; ++aIter)
{
const ::boost::shared_ptr<OSectionWindow> pSectionWindow = (*aIter);
impl_resizeSectionWindow(*pSectionWindow.get(),aStartPoint,true);
- } // for (;aIter != aEnd ; ++aIter)
+ }
}
}
// -----------------------------------------------------------------------------
@@ -295,7 +295,6 @@ void OViewsWindow::Paint( const Rectangle& rRect )
//------------------------------------------------------------------------------
void OViewsWindow::ImplInitSettings()
{
- // SetBackground( Wallpaper( COL_LIGHTBLUE ));
SetBackground( );
SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
@@ -333,7 +332,7 @@ void OViewsWindow::removeSection(USHORT _nPosition)
m_aSections.erase(aPos);
Resize();
- } // if ( _nPosition < m_aSections.size() )
+ }
}
//------------------------------------------------------------------------------
void OViewsWindow::toggleGrid(BOOL _bVisible)
@@ -406,10 +405,6 @@ void OViewsWindow::Copy()
::std::for_each(m_aSections.begin(),m_aSections.end(),
::std::compose1(::boost::bind(&OReportSection::Copy,_1,::boost::ref(aAllreadyCopiedObjects)),TReportPairHelper()));
- //TSectionsMap::iterator aIter = m_aSections.begin();
- //TSectionsMap::iterator aEnd = m_aSections.end();
- //for (; aIter != aEnd; ++aIter)
- // (*aIter)->getReportSection().Copy(aAllreadyCopiedObjects);
OReportExchange* pCopy = new OReportExchange(aAllreadyCopiedObjects);
uno::Reference< datatransfer::XTransferable> aEnsureDelete = pCopy;
pCopy->CopyToClipboard(this);
@@ -500,9 +495,9 @@ void OViewsWindow::Paste()
}
break;
}
- } // ( (*aIter).second->isMarked() )
+ }
++nCurrentPosition;
- } // for (; aIter != aEnd ; ++aIter)
+ }
return pRet;
}
@@ -541,29 +536,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
(*aIter)->getReportSection().deactivateOle();
(*aIter)->getReportSection().getSectionView().UnmarkAllObj();
}
- } // for (; aIter != aEnd ; ++aIter)
+ }
m_bInUnmark = sal_False;
}
}
-//-----------------------------------------------------------------------------
-/*
-::boost::shared_ptr<OSectionWindow> OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection)
-{
- OSL_ENSURE(_xSection.is(),"Section is NULL!");
- ::boost::shared_ptr<OSectionWindow> pRet;
- TSectionsMap::iterator aIter = m_aSections.begin();
- TSectionsMap::iterator aEnd = m_aSections.end();
- for (; aIter != aEnd ; ++aIter)
- {
- if ( (*aIter)->getReportSection().getSection() == _xSection )
- {
- pRet = (*aIter);
- break;
- } // if ( (*aIter)->getSection() == _xSection )
- } // for (; aIter != aEnd ; ++aIter)
- return pRet;
-}
-*/
// -----------------------------------------------------------------------
void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32)
{
@@ -620,7 +596,6 @@ sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent)
TSectionsMap::iterator aEnd = m_aSections.end();
for (;aIter != aEnd ; ++aIter)
{
- //if ( (*aIter).getReportSection().getSectionView().->AreObjectsMarked() )
if ( (*aIter)->getStartMarker().isMarked() )
{
bRet = (*aIter)->getReportSection().handleKeyEvent(_rEvent);
@@ -917,10 +892,8 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
{
if ( _nControlModification == ControlModification::WIDTH_SMALLEST || _nControlModification == ControlModification::WIDTH_GREATEST )
pObjBase->getReportComponent()->setSize(awt::Size(nXMov,aObjRect.getHeight()));
- //pObj->Resize(aObjRect.TopLeft(),Fraction(nXMov,aObjRect.getWidth()),Fraction(1,1));
else if ( _nControlModification == ControlModification::HEIGHT_GREATEST || _nControlModification == ControlModification::HEIGHT_SMALLEST )
pObjBase->getReportComponent()->setSize(awt::Size(aObjRect.getWidth(),nYMov));
- //pObj->Resize(aObjRect.TopLeft(),Fraction(1,1),Fraction(nYMov,aObjRect.getHeight()));
}
}
break;
@@ -1060,14 +1033,10 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
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("com.sun.star.form.component.FixedText")));
if (pNewObj)
{
pNewObj->SetLogicRect(_aRect);
- // pNewObj->SetSize(_aRect.GetSize());
- // pNewObj->Move(Size(_aRect.Left(), _aRect.Top()));
pNewObj->Move(Size(0, aNewPos.Y()));
BOOL bChanged = rView.GetModel()->IsChanged();
@@ -1076,13 +1045,11 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
m_aBegDragTempList.push_back(pNewObj);
Rectangle aRect = pNewObj->GetLogicRect();
- // pNewObj->SetText(String::CreateFromAscii("Drag helper"));
rView.MarkObj( pNewObj, rView.GetSdrPageView() );
}
}
const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
aNewPos.Y() -= nSectionHeight;
-// aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
}
}
// -----------------------------------------------------------------------------
@@ -1147,14 +1114,6 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d\n", aRect.Left(), aRect.Top(), nViewCount );
BegDragObj_createInvisibleObjectAtPosition(aRect, rView);
-
- // 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)
-// m_aDragDelta.X() = nDeltaX;
-// if (m_aDragDelta.Y() > nDeltaY)
-// m_aDragDelta.Y() = nDeltaY;
}
}
}
@@ -1165,9 +1124,6 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
aNewObjPos.Y() += nSectionHeight;
-
- // 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());
@@ -1176,38 +1132,13 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
m_aDragDelta.Y() = nDeltaY;
Point aNewPos = aAbsolutePnt;
- // for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
- // {
- // OReportSection& rReportSection = (*aIter)->getReportSection();
- // if ( &rReportSection.getSectionView() == _pSection )
- // break;
- // aNewPos.Y() += rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
- // }
const short nDrgLog = static_cast<short>(PixelToLogic(Size(3,0)).Width());
- // long nLastSectionHeight = 0;
- // bool bAdd = true;
nViewCount = 0;
for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
{
OReportSection& rReportSection = (*aIter)->getReportSection();
- // if ( &rReportSection.getSectionView() == _pSection )
- // {
- // bAdd = false;
- // aNewPos = _aPnt;
- // }
- // else if ( bAdd )
- // {
- // const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
- // aNewPos.Y() += nSectionHeight;
- // }
- // else
- // {
- // aNewPos.Y() -= nLastSectionHeight;
- // }
-
- //?
SdrHdl* pHdl = _pHdl;
if ( pHdl )
{
@@ -1222,8 +1153,6 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
aNewPos.Y() -= nSectionHeight;
- // subtract the height between the views, because they are visible but not from interest here.
- // aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
}
}
@@ -1260,10 +1189,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection)
}
rReportSection.getSectionView().BegMarkObj ( aNewPos );
nLastSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
-
- // aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
}
- //::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( _aPnt , eMarkAction) );
}
// -----------------------------------------------------------------------------
OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt)
@@ -1341,9 +1267,6 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSe
EndDragObj_removeInvisibleObjects();
// we need to manipulate the current clickpoint, we substract the old delta from BeginDrag
- // OSectionView* pInSection = getSectionRelativeToPosition(_pSection, aPnt);
- // aNewPos.X() -= m_aDragDelta.X();
- // aNewPos.Y() -= m_aDragDelta.Y();
aNewPos -= m_aDragDelta;
uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects;
@@ -1359,7 +1282,7 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSe
}
else
pInSection->EndDragObj(FALSE);
- } // for (; aIter != aEnd; ++aIter)
+ }
if ( aAllreadyCopiedObjects.getLength() )
{
@@ -1455,11 +1378,9 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
aHdlPos = pHdl->GetPos();
}
- TSectionsMap::iterator aIter/* = m_aSections.begin() */;
+ TSectionsMap::iterator aIter;
TSectionsMap::iterator aEnd = m_aSections.end();
- //if ( _bMove )
- //{
for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
{
OReportSection& rReportSection = (*aIter)->getReportSection();
@@ -1467,8 +1388,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
break;
const long nSectionHeight = (*aIter)->PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
aCurrentSectionPos.Y() += nSectionHeight;
- } // for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
- //}
+ }
aRealMousePos += aCurrentSectionPos;
// If control key is pressed the work area is limited to the section with the current selection.
@@ -1483,7 +1403,6 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
{
Rectangle aClipRect = rView.GetWorkArea();
aClipRect.Top() = aCurrentSectionPos.Y() - aPosForWorkArea.Y();
- // if (aClipRect.Top() < 0) aClipRect.Top() = 0;
aClipRect.Bottom() = aClipRect.Top() + nSectionHeight;
rView.SetWorkArea( aClipRect );
}
@@ -1494,7 +1413,6 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
rView.SetWorkArea( aClipRect );
}
aPosForWorkArea.Y() += nSectionHeight;
- // aNewPos.Y() += PixelToLogic(aIter->second.second->GetSizePixel()).Height();
}
@@ -1762,7 +1680,7 @@ void OViewsWindow::zoom(const Fraction& _aZoom)
for (;aIter != aEnd ; ++aIter)
{
(*aIter)->zoom(_aZoom);
- } // for (;aIter != aEnd ; ++aIter)
+ }
Resize();
@@ -1771,7 +1689,7 @@ void OViewsWindow::zoom(const Fraction& _aZoom)
aOut = PixelToLogic(aOut);
Rectangle aRect(PixelToLogic(Point(0,0)),aOut);
- Invalidate(aRect,/*INVALIDATE_NOERASE | */INVALIDATE_NOCHILDREN /*| INVALIDATE_TRANSPARENT*/);
+ Invalidate(aRect,INVALIDATE_NOCHILDREN);
}
//----------------------------------------------------------------------------
void OViewsWindow::scrollChildren(const Point& _aThumbPos)
@@ -1786,7 +1704,6 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos)
aMapMode.SetOrigin( Point(aOld.X() , - aPosY.Y()));
SetMapMode( aMapMode );
- //OWindowPositionCorrector aCorrector(this,0,-( aOld.Y() + aPosY.Y()));
Scroll(0, -( aOld.Y() + aPosY.Y()),SCROLL_CHILDREN);
Resize();
Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_TRANSPARENT);
@@ -1797,7 +1714,7 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos)
for (;aIter != aEnd ; ++aIter)
{
(*aIter)->scrollChildren(aPos.X());
- } // for (;aIter != aEnd ; ++aIter)
+ }
}
// -----------------------------------------------------------------------------
void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 10fdbce9a06e..01c7dbc82d17 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -96,7 +96,6 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
Rectangle aOutRect( pScrollWindow->getThumbPos(), aOut );
aOutRect = m_pParent->PixelToLogic( aOutRect );
- //Rectangle aWorkArea = m_pParent->getView()->GetWorkArea();
Point aGcc3WorkaroundTemporary;
Rectangle aWorkArea(aGcc3WorkaroundTemporary,pScrollWindow->getTotalSize());
aWorkArea.Right() -= (long)aStartWidth;
@@ -134,7 +133,6 @@ DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
m_bUiActive(false),
m_bShowPropertyBrowser(false)
{
- // m_pParent = _pParent;
aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) );
m_rView.SetActualWin( m_pParent);
aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
@@ -152,14 +150,7 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC
try
{
uno::Reference<report::XReportComponent> xComponent(_xObj, uno::UNO_QUERY_THROW);
- // NOT NEED if UNO_QUERY_THROW:
- // if (xComponent.is())
- // {
uno::Reference< beans::XPropertySet > xProp(xComponent, uno::UNO_QUERY_THROW);
- // if (xProp.is())
- // {
- // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground"))
- // is PROPERTY_CONTROLBACKGROUND
uno::Any aAny = xProp->getPropertyValue(PROPERTY_CONTROLBACKGROUND);
if (aAny.hasValue())
{
@@ -168,12 +159,9 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC
uno::Any aBlackColorAny = uno::makeAny(_nColorTRGB);
xProp->setPropertyValue(PROPERTY_CONTROLBACKGROUND, aBlackColorAny);
}
- // aCopies.push_back(xComponent->createClone());
}
catch(uno::Exception&)
{
- // bit my shiny metal as!
- // OSL_ENSURE(0,"Can't copy report elements!");
}
return nBackColor;
}
@@ -214,7 +202,6 @@ BOOL DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
else
{
SdrHdl* pHdl = m_rView.PickHandle(m_aMDPos);
- //m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(m_pView);
// if selected object was hit, drag object
if ( pHdl!=NULL || m_rView.IsMarkedHit(m_aMDPos) )
@@ -269,8 +256,8 @@ void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt)
const SdrMark* pMark = rMarkList.GetMark(0);
SdrObject* pObj = pMark->GetMarkedSdrObj();
activateOle(pObj);
- } // if (rMarkList.GetMarkCount() == 1)
- } // if ( pView->AreObjectsMarked() )
+ }
+ }
}
}
// -----------------------------------------------------------------------------
@@ -319,7 +306,6 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
((SdrHdlList&)rHdlList).ResetFocusHdl();
else
m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
- //m_rView.UnmarkAll();
deactivateOle(true);
bReturn = FALSE;
@@ -391,7 +377,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
{
bReturn = TRUE;
break;
- } // if ( !rCode.IsMod1() && !rCode.IsMod2() )
+ }
// run through
default:
{
@@ -445,8 +431,8 @@ void DlgEdFunc::activateOle(SdrObject* _pObj)
}
}
}
- } // if (nSdrObjKind == OBJ_OLE2)
- } // if ( _pObj )
+ }
+ }
}
// -----------------------------------------------------------------------------
void DlgEdFunc::deactivateOle(bool _bSelect)
@@ -474,9 +460,9 @@ void DlgEdFunc::deactivateOle(bool _bSelect)
SdrPageView* pPV = m_rView.GetSdrPageView();
m_rView.MarkObj(pObj, pPV);
}
- } // if ( xObj.is() && xObj->getCurrentState() == embed::EmbedStates::UI_ACTIVE )
+ }
}
- } // for(ULONG i = 0 ; i< nCount;++i)
+ }
}
// -----------------------------------------------------------------------------
void DlgEdFunc::colorizeOverlappedObject(SdrObject* _pOverlappedObj)
@@ -584,7 +570,6 @@ bool DlgEdFunc::isOnlyCustomShapeMarked()
for (sal_uInt32 i = 0; i < rMarkList.GetMarkCount();++i )
{
SdrMark* pMark = rMarkList.GetMark(i);
- // bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL;
SdrObject* pObj = pMark->GetMarkedSdrObj();
if (pObj->GetObjIdentifier() != OBJ_CUSTOMSHAPE)
{
@@ -609,7 +594,6 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
if ( !bIsSetPoint )
{
// no drag rect, we have to check every single select rect
- //const Rectangle& rRect = m_rView.GetDragStat().GetActionRect();
const SdrDragStat& rDragStat = m_rView.GetDragStat();
if (rDragStat.GetDragMethod() != NULL)
{
@@ -702,9 +686,6 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
nId != OBJ_CUSTOMSHAPE)
{
// there is an object under the mouse cursor, but not a customshape
- // rtl::OUString suWasN = m_rView.getInsertObjString();
- // rtl::OUString suWasN2 = m_pParent->getSectionWindow()->getViewsWindow()->GetInsertObjString();
-
m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
return FALSE;
}
@@ -770,7 +751,6 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
for (sal_uInt32 i = 0; i < rMarkList.GetMarkCount();++i )
{
SdrMark* pMark = rMarkList.GetMark(i);
- // bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL;
OOle2Obj* pObj = dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj());
if ( pObj && !pObj->IsEmpty() )
{
@@ -791,7 +771,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
SdrViewEvent aVEvt;
m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
m_rView.MarkObj(aVEvt.pRootObj, pPV);
- } // ift() && !rMEvt.IsMod2() )
+ }
checkTwoCklicks(rMEvt);
m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
return bReturn;
@@ -827,9 +807,6 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == NULL, false);
}
- //if ( isOver(m_rView.GetCreateObj(),*m_pParent->getPage(),*m_pView) )
- // m_pParent->SetPointer( Pointer(POINTER_NOTALLOWED));
- //else
if ( !bIsSetPoint )
m_pParent->SetPointer( m_rView.GetPreferedPointer( aPos, m_pParent) );
@@ -880,7 +857,6 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
{
if( !rMEvt.IsShift() )
m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
- //m_rView.UnmarkAll();
if ( rMEvt.GetClicks() == 1 )
{
@@ -948,15 +924,6 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
{
aPnt.Y() = 0;
}
- // grow section if it is under the current section
-// else
-// {
-// const Size& aSectionSize = m_rView->GetSizePixel();
-// if ( aPnt.Y() > aSectionSize.Height() )
-// {
-// aPnt.Y() = aSectionSize.Height();
-// }
-// }
}
// drag or resize an object
bool bControlKey = rMEvt.IsMod1();
@@ -974,147 +941,6 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
return TRUE;
}
-// -----------------------------------------------------------------------------
-//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);
-//
-// BOOL bEmptyOutliner = FALSE;
-//
-// 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 (_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)
-// 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;
-//
-// nCntrl &= ~EE_CNTRL_ULSPACESUMMATION;
-// //if ( pModel->IsSummationOfParagraphs() )
-// // nCntrl |= EE_CNTRL_ULSPACESUMMATION;
-//
-// //SetSpellOptions( nCntrl );
-//
-// pOutl->SetControlWord(nCntrl);
-//
-// uno::Reference< linguistic2::XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() );
-// if ( xSpellChecker.is() )
-// pOutl->SetSpeller( xSpellChecker );
-//
-// uno::Reference< linguistic2::XHyphenator > xHyphenator( LinguMgr::GetHyphenator() );
-// if( xHyphenator.is() )
-// pOutl->SetHyphenator( xHyphenator );
-//
-// 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);
-// }
-//
-// 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 (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor)
-// {
-// //bFirstObjCreated = TRUE;
-// //DeleteDefaultText();
-//
-// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView();
-//
-// nSdrObjKind = _pTextObj->GetObjIdentifier();
-//
-// 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 ( 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/makefile.mk b/reportdesign/source/ui/report/makefile.mk
index 3c19923f4c19..0383a98be4a8 100644
--- a/reportdesign/source/ui/report/makefile.mk
+++ b/reportdesign/source/ui/report/makefile.mk
@@ -36,7 +36,6 @@ VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-# .INCLUDE : $(PRJ)$/util$/dll.pmk
IMGLST_SRS=$(SRS)$/$(TARGET).srs
# --- Files --------------------------------------------------------
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 7d43829a112a..82f0af585963 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -141,9 +141,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen
xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ),
UNO_QUERY_THROW );
- /*uno::Reference< XComponent> xModel = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getModel(),uno::UNO_QUERY) );
- uno::Reference< XComponent> xDialogParentWindow = new OContextHelper(m_xORB,uno::Reference< XComponent>(VCLUnoHelper::GetInterface ( this ),uno::UNO_QUERY) );
- uno::Reference< XComponent> xConnection = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getConnection(),uno::UNO_QUERY) );*/
// a ComponentContext for the
::cppu::ContextEntry_Init aHandlerContextInfo[] =
{
@@ -351,8 +348,6 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface>
{
OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" );
}
-
- //Resize();
}
SetText( GetHeadlineName(_aObjects) );
}
@@ -582,7 +577,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) );
generated by cgit (git 2.34.1) at 2024-06-15 09:38:50 +0000