You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/08/08 17:01:58 UTC
svn commit: r1511822 [1/5] - in /openoffice/branches/alg/aw080/main:
basegfx/source/point/ basegfx/source/vector/
chart2/source/controller/dialogs/ chart2/source/controller/drawinglayer/
chart2/source/controller/inc/ chart2/source/controller/main/ char...
Author: alg
Date: Thu Aug 8 15:01:55 2013
New Revision: 1511822
URL: http://svn.apache.org/r1511822
Log:
adaptions, changes, warnings reviewed
Modified:
openoffice/branches/alg/aw080/main/basegfx/source/point/b2dpoint.cxx
openoffice/branches/alg/aw080/main/basegfx/source/vector/b2dvector.cxx
openoffice/branches/alg/aw080/main/chart2/source/controller/dialogs/tp_Scale.cxx
openoffice/branches/alg/aw080/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
openoffice/branches/alg/aw080/main/chart2/source/controller/inc/DrawViewWrapper.hxx
openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx
openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartTransferable.cxx
openoffice/branches/alg/aw080/main/chart2/source/view/charttypes/PieChart.cxx
openoffice/branches/alg/aw080/main/chart2/source/view/main/ChartView.cxx
openoffice/branches/alg/aw080/main/chart2/source/view/main/VTitle.cxx
openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconpol.cxx
openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconrec.cxx
openoffice/branches/alg/aw080/main/sd/inc/Outliner.hxx
openoffice/branches/alg/aw080/main/sd/inc/sdpage.hxx
openoffice/branches/alg/aw080/main/sd/source/core/drawdoc3.cxx
openoffice/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx
openoffice/branches/alg/aw080/main/sd/source/core/sdpage.cxx
openoffice/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
openoffice/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx
openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.cxx
openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.hxx
openoffice/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx
openoffice/branches/alg/aw080/main/sd/source/filter/xml/sdtransform.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/animations/SlideTransitionPane.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationmanager.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/app/tmplctrl.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/dlg/dlgassim.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/dlg/docprev.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/dlg/present.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdpreslt.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdtreelb.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel2.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel4.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/framework/module/ModuleController.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconbez.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconrec.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/func/fuolbull.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/ClientView.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/DrawDocShell.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/FrameView.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/PresentationViewShell.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideView.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideViewShell.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/View.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewClipboard.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewShell.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/drawview.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/fuolbull.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/inc/sdpreslt.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CustomAnimationPanel.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPageObserver.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelBase.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelFactory.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PreviewValueSet.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/SlideTransitionPanel.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsTheme.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/table/tableobjectbar.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unolayer.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unomodel.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewClipboard.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewTabBar.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/clview.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/drawview.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/drviews5.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/drviews7.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/drviews8.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/drviewsa.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/drviewsb.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/frmview.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/outlnvsh.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/outlview.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/presvish.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/sdview.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/tabcontr.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/view/viewshel.cxx
openoffice/branches/alg/aw080/main/svx/Library_svxcore.mk
openoffice/branches/alg/aw080/main/svx/Package_inc.mk
openoffice/branches/alg/aw080/main/svx/inc/svx/fmview.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/sdrpaintwindow.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdocapt.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdocirc.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdoedge.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdomeas.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdopath.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdorect.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdotable.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdotext.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdpagv.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdpntv.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdsnpv.hxx
openoffice/branches/alg/aw080/main/svx/inc/svx/svdundo.hxx
openoffice/branches/alg/aw080/main/svx/source/form/fmview.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/sdrpaintwindow.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/sdrselection.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdcrtv.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svddrgmt.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdocirc.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdoedge.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdopath.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdorect.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdotxdr.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdotxtr.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdpagv.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdpntv.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdsnpv.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx
openoffice/branches/alg/aw080/main/svx/source/svdraw/svdview.cxx
openoffice/branches/alg/aw080/main/svx/source/table/svdotable.cxx
openoffice/branches/alg/aw080/main/svx/source/tbxctrls/SvxColorValueSet.cxx
openoffice/branches/alg/aw080/main/svx/source/unodraw/UnoGraphicExporter.cxx
openoffice/branches/alg/aw080/main/svx/source/unodraw/gluepts.cxx
openoffice/branches/alg/aw080/main/svx/source/unodraw/unomod.cxx
openoffice/branches/alg/aw080/main/svx/source/unodraw/unoshap2.cxx
openoffice/branches/alg/aw080/main/svx/source/xoutdev/xtabgrdt.cxx
openoffice/branches/alg/aw080/main/xmloff/inc/xmloff/shapeimport.hxx
openoffice/branches/alg/aw080/main/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
openoffice/branches/alg/aw080/main/xmloff/inc/xmloff/xmluconv.hxx
openoffice/branches/alg/aw080/main/xmloff/source/chart/PropertyMaps.cxx
openoffice/branches/alg/aw080/main/xmloff/source/core/xmluconv.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/shapeexport2.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/shapeexport4.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/shapeimport.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/xexptran.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximp3dobject.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximp3dobject.hxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximp3dscene.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximp3dscene.hxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximpcustomshape.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximpgrp.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximpgrp.hxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximpshap.cxx
openoffice/branches/alg/aw080/main/xmloff/source/draw/ximpshap.hxx
openoffice/branches/alg/aw080/main/xmloff/source/style/chrhghdl.cxx
Modified: openoffice/branches/alg/aw080/main/basegfx/source/point/b2dpoint.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/basegfx/source/point/b2dpoint.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/basegfx/source/point/b2dpoint.cxx (original)
+++ openoffice/branches/alg/aw080/main/basegfx/source/point/b2dpoint.cxx Thu Aug 8 15:01:55 2013
@@ -19,10 +19,9 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basegfx.hxx"
+
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/numeric/ftools.hxx>
Modified: openoffice/branches/alg/aw080/main/basegfx/source/vector/b2dvector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/basegfx/source/vector/b2dvector.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/basegfx/source/vector/b2dvector.cxx (original)
+++ openoffice/branches/alg/aw080/main/basegfx/source/vector/b2dvector.cxx Thu Aug 8 15:01:55 2013
@@ -19,10 +19,9 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basegfx.hxx"
+
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/numeric/ftools.hxx>
Modified: openoffice/branches/alg/aw080/main/chart2/source/controller/dialogs/tp_Scale.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/controller/dialogs/tp_Scale.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/controller/dialogs/tp_Scale.cxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/controller/dialogs/tp_Scale.cxx Thu Aug 8 15:01:55 2013
@@ -334,7 +334,7 @@ void ScaleTabPage::EnableControls()
{
//transport value from one to other control
if( bWasDateAxis )
- lcl_setValue( aFmtFldStepMain, m_aMt_MainDateStep.GetValue() );
+ lcl_setValue( aFmtFldStepMain, static_cast< double >(m_aMt_MainDateStep.GetValue()));
else
m_aMt_MainDateStep.SetValue( static_cast<sal_Int32>(aFmtFldStepMain.GetValue()) );
}
@@ -542,18 +542,18 @@ void ScaleTabPage::Reset(const SfxItemSe
if (rInAttrs.GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,sal_True, &pPoolItem) == SFX_ITEM_SET)
{
m_nTimeResolution = ((const SfxInt32Item*)pPoolItem)->GetValue();
- m_aLB_TimeResolution.SelectEntryPos( m_nTimeResolution );
+ m_aLB_TimeResolution.SelectEntryPos(static_cast< sal_uInt16 >(m_nTimeResolution));
}
if (rInAttrs.GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,sal_True, &pPoolItem) == SFX_ITEM_SET)
{
m_nMainTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
- m_aLB_MainTimeUnit.SelectEntryPos( m_nMainTimeUnit );
+ m_aLB_MainTimeUnit.SelectEntryPos(static_cast< sal_uInt16 >(m_nMainTimeUnit));
}
if (rInAttrs.GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,sal_True, &pPoolItem) == SFX_ITEM_SET)
{
m_nHelpTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
- m_aLB_HelpTimeUnit.SelectEntryPos( m_nHelpTimeUnit );
+ m_aLB_HelpTimeUnit.SelectEntryPos(static_cast< sal_uInt16 >(m_nHelpTimeUnit));
}
EnableControls();
Modified: openoffice/branches/alg/aw080/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx Thu Aug 8 15:01:55 2013
@@ -286,11 +286,11 @@ void DrawViewWrapper::setMarkHandleProvi
m_pMarkHandleProvider = pMarkHandleProvider;
}
-void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* /* pRedirector */)
+void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* /* pRedirector */) const
{
svtools::ColorConfig aColorConfig;
Color aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
- this->SetApplicationBackgroundColor(aFillColor);
+ const_cast< DrawViewWrapper* >(this)->SetApplicationBackgroundColor(aFillColor);
this->E3dView::CompleteRedraw( pOut, rReg );
}
Modified: openoffice/branches/alg/aw080/main/chart2/source/controller/inc/DrawViewWrapper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/controller/inc/DrawViewWrapper.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/controller/inc/DrawViewWrapper.hxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/controller/inc/DrawViewWrapper.hxx Thu Aug 8 15:01:55 2013
@@ -70,7 +70,7 @@ public:
//----------------------
//pMarkHandleProvider can be NULL; ownership is not taken
void setMarkHandleProvider( MarkHandleProvider* pMarkHandleProvider );
- void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0);
+ void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0) const;
SdrObject* getTextEditObject() const;
SdrOutliner* getOutliner() const;
Modified: openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx Thu Aug 8 15:01:55 2013
@@ -432,8 +432,8 @@ void ChartController::impl_PasteShapes(
{
Reference< drawing::XShape > xSelShape;
m_pDrawViewWrapper->BegUndo( SVX_RESSTR( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
- sal_uInt16 nCount = pModel->GetPageCount();
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ sal_uInt32 nCount = pModel->GetPageCount();
+ for ( sal_uInt32 i = 0; i < nCount; ++i )
{
const SdrPage* pPage = pModel->GetPage( i );
SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS );
Modified: openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartTransferable.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartTransferable.cxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/controller/main/ChartTransferable.cxx Thu Aug 8 15:01:55 2013
@@ -129,8 +129,8 @@ sal_Bool ChartTransferable::WriteObject(
const SfxItemPool& rItemPool = pMarkedObjModel->GetItemPool();
const SvxFontHeightItem& rDefaultFontHeight = static_cast< const SvxFontHeightItem& >(
rItemPool.GetDefaultItem( EE_CHAR_FONTHEIGHT ) );
- sal_uInt16 nCount = pMarkedObjModel->GetPageCount();
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ sal_uInt32 nCount = pMarkedObjModel->GetPageCount();
+ for ( sal_uInt32 i = 0; i < nCount; ++i )
{
const SdrPage* pPage = pMarkedObjModel->GetPage( i );
SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS );
Modified: openoffice/branches/alg/aw080/main/chart2/source/view/charttypes/PieChart.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/view/charttypes/PieChart.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/view/charttypes/PieChart.cxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/view/charttypes/PieChart.cxx Thu Aug 8 15:01:55 2013
@@ -374,7 +374,7 @@ void PieChart::createShapes()
uno::Any aAny = xPropertySet->getPropertyValue( C2U("3DRelativeHeight") );
aAny >>= n3DRelativeHeight;
}
- catch(const uno::Exception& e) {}
+ catch(const uno::Exception& /*e*/) {}
}
//=============================================================================
Modified: openoffice/branches/alg/aw080/main/chart2/source/view/main/ChartView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/view/main/ChartView.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/view/main/ChartView.cxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/view/main/ChartView.cxx Thu Aug 8 15:01:55 2013
@@ -711,7 +711,7 @@ void SeriesPlotterContainer::initializeC
if (n3DRelativeHeightOldValue != n3DRelativeHeight)
xPropertySet->setPropertyValue( C2U("3DRelativeHeight"), uno::makeAny(n3DRelativeHeight) );
}
- catch(const uno::Exception& e){}
+ catch(const uno::Exception& /*e*/){}
}
}
@@ -1632,7 +1632,11 @@ awt::Rectangle ChartView::impl_createDia
{
//if( !bIsPieOrDonut )
// aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) );
- aUsedOuterRect = awt::Rectangle( aConsumedOuterRect.getMinX(), aConsumedOuterRect.getMinY(), aConsumedOuterRect.getWidth(), aConsumedOuterRect.getHeight() );
+ aUsedOuterRect = awt::Rectangle(
+ basegfx::fround(aConsumedOuterRect.getMinX()),
+ basegfx::fround(aConsumedOuterRect.getMinY()),
+ basegfx::fround(aConsumedOuterRect.getWidth()),
+ basegfx::fround(aConsumedOuterRect.getHeight()));
}
else
aUsedOuterRect = awt::Rectangle( rAvailablePos.X, rAvailablePos.Y, rAvailableSize.Width, rAvailableSize.Height );
@@ -1652,7 +1656,11 @@ awt::Rectangle ChartView::impl_createDia
else
{
::basegfx::B2IRectangle aConsumedInnerRect = aVDiagram.getCurrentRectangle();
- m_aResultingDiagramRectangleExcludingAxes = awt::Rectangle( aConsumedInnerRect.getMinX(), aConsumedInnerRect.getMinY(), aConsumedInnerRect.getWidth(), aConsumedInnerRect.getHeight() );
+ m_aResultingDiagramRectangleExcludingAxes = awt::Rectangle(
+ basegfx::fround(aConsumedInnerRect.getMinX()),
+ basegfx::fround(aConsumedInnerRect.getMinY()),
+ basegfx::fround(aConsumedInnerRect.getWidth()),
+ basegfx::fround(aConsumedInnerRect.getHeight()));
}
}
else
@@ -1662,7 +1670,11 @@ awt::Rectangle ChartView::impl_createDia
else
{
::basegfx::B2IRectangle aConsumedInnerRect = aVDiagram.getCurrentRectangle();
- m_aResultingDiagramRectangleExcludingAxes = awt::Rectangle( aConsumedInnerRect.getMinX(), aConsumedInnerRect.getMinY(), aConsumedInnerRect.getWidth(), aConsumedInnerRect.getHeight() );
+ m_aResultingDiagramRectangleExcludingAxes = awt::Rectangle(
+ basegfx::fround(aConsumedInnerRect.getMinX()),
+ basegfx::fround(aConsumedInnerRect.getMinY()),
+ basegfx::fround(aConsumedInnerRect.getWidth()),
+ basegfx::fround(aConsumedInnerRect.getHeight()));
}
}
Modified: openoffice/branches/alg/aw080/main/chart2/source/view/main/VTitle.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/chart2/source/view/main/VTitle.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/chart2/source/view/main/VTitle.cxx (original)
+++ openoffice/branches/alg/aw080/main/chart2/source/view/main/VTitle.cxx Thu Aug 8 15:01:55 2013
@@ -250,13 +250,13 @@ void VTitle::createShapes(
}
// #i109336# Improve auto positioning in chart
- float fFontHeight = 0.0;
+ double fFontHeight = 0.0;
if ( xShapeProp.is() && ( xShapeProp->getPropertyValue( C2U( "CharHeight" ) ) >>= fFontHeight ) )
{
fFontHeight *= ( 2540. / 72. ); // pt -> 1/100 mm
- float fXFraction = 0.18;
+ double fXFraction = 0.18;
sal_Int32 nXDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fXFraction ) );
- float fYFraction = 0.30;
+ double fYFraction = 0.30;
sal_Int32 nYDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fYFraction ) );
xShapeProp->setPropertyValue( C2U( "TextLeftDistance" ), uno::makeAny( nXDistance ) );
xShapeProp->setPropertyValue( C2U( "TextRightDistance" ), uno::makeAny( nXDistance ) );
Modified: openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconpol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconpol.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconpol.cxx (original)
+++ openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconpol.cxx Thu Aug 8 15:01:55 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
@@ -28,12 +26,11 @@
#include "tabvwsh.hxx"
#include "sc.hrc"
#include "drawview.hxx"
-
-// #98185# Create default drawing objects via keyboard
#include <svx/svdopath.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <svx/svdlegacy.hxx>
+#include <svx/sdrobjecttools.hxx>
// Pixelabstand zum Schliessen von Freihand-Zeichnungen
#ifndef CLOSE_PIXDIST
@@ -247,106 +244,143 @@ void FuConstPolygon::Deactivate()
// #98185# Create default drawing objects via keyboard
SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange)
{
- // case SID_DRAW_POLYGON:
- // case SID_DRAW_POLYGON_NOFILL:
- // case SID_DRAW_BEZIER_NOFILL:
- // case SID_DRAW_FREELINE_NOFILL:
-
- SdrObject* pObj = SdrObjFactory::MakeNewObject(
- pView->getSdrModelFromSdrView(),
- pView->getSdrObjectCreationInfo());
-
- if(pObj)
- {
- SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
-
- if(pSdrPathObj)
- {
- basegfx::B2DPolyPolygon aPoly;
-
- switch(nID)
- {
- case SID_DRAW_BEZIER_NOFILL:
- {
- basegfx::B2DPolygon aInnerPoly;
-
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
-
- const basegfx::B2DPoint aCenterBottom(rRange.getCenterX(), rRange.getMaxY());
- aInnerPoly.appendBezierSegment(
- aCenterBottom,
- aCenterBottom,
- rRange.getCenter());
-
- const basegfx::B2DPoint aCenterTop(rRange.getCenterX(), rRange.getMinY());
- aInnerPoly.appendBezierSegment(
- aCenterTop,
- aCenterTop,
- basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
-
- aPoly.append(aInnerPoly);
- break;
- }
- case SID_DRAW_FREELINE_NOFILL:
- {
- basegfx::B2DPolygon aInnerPoly;
-
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
-
- aInnerPoly.appendBezierSegment(
- rRange.getMinimum(),
- basegfx::B2DPoint(rRange.getCenterX(), rRange.getMinY()),
- rRange.getCenter());
-
- aInnerPoly.appendBezierSegment(
- basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()),
- basegfx::B2DPoint(rRange.getMaxX(), rRange.getMaxY()),
- basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
-
- aPoly.append(aInnerPoly);
- break;
- }
- case SID_DRAW_POLYGON:
- case SID_DRAW_POLYGON_NOFILL:
- {
- basegfx::B2DPolygon aInnerPoly;
- const double fWdt(rRange.getWidth());
- const double fHgt(rRange.getHeight());
-
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.3, rRange.getMinY() + fHgt * 0.7));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMinY() + fHgt * 0.15));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.65, rRange.getMinY()));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt, rRange.getMinY() + fHgt * 0.3));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 0.5));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 0.75));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMaxY(), rRange.getMaxX()));
-
- if(SID_DRAW_POLYGON_NOFILL == nID)
- {
- aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()));
- }
- else
- {
- aInnerPoly.setClosed(true);
- }
-
- aPoly.append(aInnerPoly);
- break;
- }
- }
-
- pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(aPoly);
- }
- else
- {
- DBG_ERROR("Object is NO path object");
- }
-
- sdr::legacy::SetLogicRange(*pObj, rRange);
- }
-
- return pObj;
+ SdrPathObj* pRetval = dynamic_cast< SdrPathObj* >(
+ SdrObjFactory::MakeNewObject(
+ pView->getSdrModelFromSdrView(),
+ pView->getSdrObjectCreationInfo()));
+
+ if(pRetval)
+ {
+ DefaultSdrPathObjType eType(DefaultSdrPathObjType_Line);
+ bool bClosed(false);
+
+ switch(nID)
+ {
+ case SID_DRAW_BEZIER_NOFILL:
+ eType = DefaultSdrPathObjType_Bezier;
+ break;
+ case SID_DRAW_FREELINE_NOFILL:
+ eType = DefaultSdrPathObjType_Freeline;
+ break;
+ case SID_DRAW_POLYGON:
+ eType = DefaultSdrPathObjType_Polygon;
+ bClosed = true;
+ break;
+ case SID_DRAW_POLYGON_NOFILL:
+ eType = DefaultSdrPathObjType_Polygon;
+ break;
+ }
+
+ initializeDefaultSdrPathObjByObjectType(*pRetval, eType, rRange, bClosed);
+ }
+ else
+ {
+ OSL_ENSURE(false, "Could not create default path object (!)");
+ }
+
+ return pRetval;
+
+ // TTTT
+// // case SID_DRAW_POLYGON:
+// // case SID_DRAW_POLYGON_NOFILL:
+// // case SID_DRAW_BEZIER_NOFILL:
+// // case SID_DRAW_FREELINE_NOFILL:
+//
+// SdrObject* pObj = SdrObjFactory::MakeNewObject(
+// pView->getSdrModelFromSdrView(),
+// pView->getSdrObjectCreationInfo());
+//
+// if(pObj)
+// {
+// SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
+//
+// if(pSdrPathObj)
+// {
+// basegfx::B2DPolyPolygon aPoly;
+//
+// switch(nID)
+// {
+// case SID_DRAW_BEZIER_NOFILL:
+// {
+// basegfx::B2DPolygon aInnerPoly;
+//
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
+//
+// const basegfx::B2DPoint aCenterBottom(rRange.getCenterX(), rRange.getMaxY());
+// aInnerPoly.appendBezierSegment(
+// aCenterBottom,
+// aCenterBottom,
+// rRange.getCenter());
+//
+// const basegfx::B2DPoint aCenterTop(rRange.getCenterX(), rRange.getMinY());
+// aInnerPoly.appendBezierSegment(
+// aCenterTop,
+// aCenterTop,
+// basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
+//
+// aPoly.append(aInnerPoly);
+// break;
+// }
+// case SID_DRAW_FREELINE_NOFILL:
+// {
+// basegfx::B2DPolygon aInnerPoly;
+//
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
+//
+// aInnerPoly.appendBezierSegment(
+// rRange.getMinimum(),
+// basegfx::B2DPoint(rRange.getCenterX(), rRange.getMinY()),
+// rRange.getCenter());
+//
+// aInnerPoly.appendBezierSegment(
+// basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()),
+// basegfx::B2DPoint(rRange.getMaxX(), rRange.getMaxY()),
+// basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
+//
+// aPoly.append(aInnerPoly);
+// break;
+// }
+// case SID_DRAW_POLYGON:
+// case SID_DRAW_POLYGON_NOFILL:
+// {
+// basegfx::B2DPolygon aInnerPoly;
+// const double fWdt(rRange.getWidth());
+// const double fHgt(rRange.getHeight());
+//
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.3, rRange.getMinY() + fHgt * 0.7));
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMinY() + fHgt * 0.15));
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.65, rRange.getMinY()));
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt, rRange.getMinY() + fHgt * 0.3));
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 0.5));
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 0.75));
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getMaxY(), rRange.getMaxX()));
+//
+// if(SID_DRAW_POLYGON_NOFILL == nID)
+// {
+// aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()));
+// }
+// else
+// {
+// aInnerPoly.setClosed(true);
+// }
+//
+// aPoly.append(aInnerPoly);
+// break;
+// }
+// }
+//
+// pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(aPoly);
+// }
+// else
+// {
+// DBG_ERROR("Object is NO path object");
+// }
+//
+// sdr::legacy::SetLogicRange(*pObj, rRange);
+// }
+//
+// return pObj;
}
// eof
Modified: openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconrec.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconrec.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconrec.cxx (original)
+++ openoffice/branches/alg/aw080/main/sc/source/ui/drawfunc/fuconrec.cxx Thu Aug 8 15:01:55 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
@@ -35,12 +33,9 @@
#include <basegfx/point/b2dpoint.hxx>
#include <svx/svdlegacy.hxx>
#include <svx/sdrobjectfactory.hxx>
-
+#include <svx/sdrobjecttools.hxx>
#include "scresid.hxx"
-//------------------------------------------------------------------------
-
-
/*************************************************************************
|*
|* Konstruktor
@@ -240,26 +235,30 @@ SdrObject* FuConstRectangle::CreateDefau
{
switch(nID)
{
- case SID_DRAW_LINE:
- {
- SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
-
- if(pSdrPathObj)
- {
- const double fYMiddle((rRange.getMinY() + rRange.getMaxY()) * 0.5);
- basegfx::B2DPolygon aPoly;
- aPoly.append(basegfx::B2DPoint(rRange.getMinX(), fYMiddle));
- aPoly.append(basegfx::B2DPoint(rRange.getMaxX(), fYMiddle));
- pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(basegfx::B2DPolyPolygon(aPoly));
- }
- else
- {
- DBG_ERROR("Object is NO line object");
- }
-
- break;
- }
- case SID_DRAW_CAPTION:
+ case SID_DRAW_LINE:
+ {
+ SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
+
+ if(pSdrPathObj)
+ {
+ initializeDefaultSdrPathObjByObjectType(*pSdrPathObj, DefaultSdrPathObjType_Line, rRange, false);
+ //pSdrPathObj->initializeDefaultSdrPathObjBySlotID(nID, rRange);
+
+ // TTTT
+ //const double fYMiddle((rRange.getMinY() + rRange.getMaxY()) * 0.5);
+ //basegfx::B2DPolygon aPoly;
+ //aPoly.append(basegfx::B2DPoint(rRange.getMinX(), fYMiddle));
+ //aPoly.append(basegfx::B2DPoint(rRange.getMaxX(), fYMiddle));
+ //pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(basegfx::B2DPolyPolygon(aPoly));
+ }
+ else
+ {
+ DBG_ERROR("Object is NO line object");
+ }
+
+ break;
+ }
+ case SID_DRAW_CAPTION:
case SID_DRAW_CAPTION_VERTICAL:
{
SdrCaptionObj* pSdrCaptionObj = dynamic_cast< SdrCaptionObj* >(pObj);
Modified: openoffice/branches/alg/aw080/main/sd/inc/Outliner.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/inc/Outliner.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/inc/Outliner.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/inc/Outliner.hxx Thu Aug 8 15:01:55 2013
@@ -224,7 +224,7 @@ private:
bool mbMatchMayExist;
/// The number of pages in the current view.
- sal_uInt16 mnPageCount;
+ sal_uInt32 mnPageCount;
/// Number of objects on the current page / in the current selection.
sal_Int32 mnObjectCount;
Modified: openoffice/branches/alg/aw080/main/sd/inc/sdpage.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/inc/sdpage.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/inc/sdpage.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/inc/sdpage.hxx Thu Aug 8 15:01:55 2013
@@ -95,9 +95,12 @@ namespace sd {
String maDateTimeText;
int meDateTimeFormat;
- HeaderFooterSettings();
+ HeaderFooterSettings();
+ HeaderFooterSettings(const HeaderFooterSettings& rSource);
+ ~HeaderFooterSettings();
bool operator==( const HeaderFooterSettings& rSettings ) const;
+ HeaderFooterSettings& operator=(const HeaderFooterSettings& rHeaderFooter);
};
typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > > AnnotationVector;
@@ -214,7 +217,7 @@ public:
void InsertPresObj(SdrObject* pObj, PresObjKind eKind );
void SetAutoLayout(AutoLayout eLayout, bool bInit=false, bool bCreate=false);
- AutoLayout GetAutoLayout() const { return meAutoLayout; }
+ AutoLayout GetAutoLayout() const;
void CreateTitleAndLayout(bool bInit=false, bool bCreate=false);
SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, const basegfx::B2DRange& rRange, bool bInit );
@@ -226,7 +229,7 @@ public:
void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rStr );
void SetPageKind(PageKind ePgType) { mePageKind = ePgType; }
- PageKind GetPageKind() const { return mePageKind; }
+ PageKind GetPageKind() const;
void SetSelected(bool bSel) { mbSelected = bSel; }
bool IsSelected() const { return mbSelected; }
@@ -234,10 +237,10 @@ public:
void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect);
::com::sun::star::presentation::FadeEffect GetFadeEffect() const;
- void SetPresChange(PresChange eChange) { mePresChange = eChange; }
+ void SetPresChange(PresChange eChange);
PresChange GetPresChange() const { return mePresChange; }
- void SetTime(sal_uInt32 nNewTime) { mnTime = nNewTime; }
+ void SetTime(sal_uInt32 nNewTime);
sal_uInt32 GetTime() const { return mnTime; }
void SetSound(bool bNewSoundOn) { mbSoundOn = bNewSoundOn; }
Modified: openoffice/branches/alg/aw080/main/sd/source/core/drawdoc3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/core/drawdoc3.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/core/drawdoc3.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/core/drawdoc3.cxx Thu Aug 8 15:01:55 2013
@@ -2120,11 +2120,11 @@ void SdDrawDocument::Merge(SdrModel& rSo
bool bMergeMasterPages, bool bAllMasterPages,
bool bUndo, bool bTreadSourceAsConst)
{
- sal_uInt16 nMasterPageCount = GetMasterPageCount();
+ sal_uInt32 nMasterPageCount = GetMasterPageCount();
SdrModel::Merge( rSourceModel, nFirstPageNum, nLastPageNum, nDestPos, bMergeMasterPages, bAllMasterPages, bUndo, bTreadSourceAsConst );
// add style family for each new master page
- for( sal_uInt16 nMaster = nMasterPageCount; nMaster < GetMasterPageCount(); nMaster++ )
+ for( sal_uInt32 nMaster = nMasterPageCount; nMaster < GetMasterPageCount(); nMaster++ )
{
SdPage* pPage = static_cast< SdPage* >( GetMasterPage( nMaster ) );
if( pPage && pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) )
Modified: openoffice/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx Thu Aug 8 15:01:55 2013
@@ -1111,9 +1111,9 @@ void SdDrawDocument::ImpOnlineSpellCallb
void SdDrawDocument::RestoreLayerNames()
{
SdrLayerAdmin& rLayerAdmin = GetModelLayerAdmin();
- sal_uInt16 nLayerCount = rLayerAdmin.GetLayerCount();
+ sal_uInt32 nLayerCount = rLayerAdmin.GetLayerCount();
- for (sal_uInt16 nLayer = 0; nLayer < nLayerCount; nLayer++)
+ for (sal_uInt32 nLayer = 0; nLayer < nLayerCount; nLayer++)
{
SdrLayer* pLayer = rLayerAdmin.GetLayer(nLayer);
Modified: openoffice/branches/alg/aw080/main/sd/source/core/sdpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/core/sdpage.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/core/sdpage.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/core/sdpage.cxx Thu Aug 8 15:01:55 2013
@@ -3176,6 +3176,27 @@ bool SdPage::IsPrecious (void) const
+void SdPage::SetTime(sal_uInt32 nNewTime)
+{
+ mnTime = nNewTime;
+}
+
+void SdPage::SetPresChange(PresChange eChange)
+{
+ mePresChange = eChange;
+}
+
+AutoLayout SdPage::GetAutoLayout() const
+{
+ return meAutoLayout;
+}
+
+PageKind SdPage::GetPageKind() const
+{
+ return mePageKind;
+}
+
+
HeaderFooterSettings::HeaderFooterSettings()
{
@@ -3187,6 +3208,16 @@ HeaderFooterSettings::HeaderFooterSettin
meDateTimeFormat = SVXDATEFORMAT_A;
}
+
+HeaderFooterSettings::HeaderFooterSettings(const HeaderFooterSettings& rSource)
+{
+ *this = rSource;
+}
+
+HeaderFooterSettings::~HeaderFooterSettings()
+{
+}
+
bool HeaderFooterSettings::operator==( const HeaderFooterSettings& rSettings ) const
{
return (mbHeaderVisible == rSettings.mbHeaderVisible) &&
@@ -3200,3 +3231,19 @@ bool HeaderFooterSettings::operator==( c
(maDateTimeText == rSettings.maDateTimeText);
}
+HeaderFooterSettings& HeaderFooterSettings::operator=(const HeaderFooterSettings& rHeaderFooter)
+{
+ mbHeaderVisible = rHeaderFooter.mbHeaderVisible;
+ maHeaderText = rHeaderFooter.maHeaderText;
+ mbFooterVisible = rHeaderFooter.mbFooterVisible;
+ maFooterText = rHeaderFooter.maFooterText;
+ mbSlideNumberVisible = rHeaderFooter.mbSlideNumberVisible;
+ mbDateTimeVisible = rHeaderFooter.mbDateTimeVisible;
+ mbDateTimeIsFixed = rHeaderFooter.mbDateTimeIsFixed;
+ maDateTimeText = rHeaderFooter.maDateTimeText;
+ meDateTimeFormat = rHeaderFooter.meDateTimeFormat;
+
+ return *this;
+}
+
+// eof
Modified: openoffice/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx Thu Aug 8 15:01:55 2013
@@ -3430,7 +3430,7 @@ void PPTWriter::ImplWriteTextStyleAtom(
}
nParaFlags >>= 16;
- sal_uInt32 nDefaultTabSize = mfMap100thMmToMs * 2011.0;
+ sal_uInt32 nDefaultTabSize = basegfx::fround(mfMap100thMmToMs * 2011.0);
sal_uInt32 nDefaultTabs = basegfx::fround(fabs(maObjectRange.getWidth())) / nDefaultTabSize;
if ( nTabs )
nDefaultTabs -= (sal_Int32)( ( ( pTabStop[ nTabs - 1 ].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize );
Modified: openoffice/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx Thu Aug 8 15:01:55 2013
@@ -222,13 +222,14 @@ sal_Bool SdGRFFilter::Import()
SdPage* pPage = mrDocument.GetSdPage( 0, PK_STANDARD );
Point aPos;
- const basegfx::B2DVector& rPageScale = pPage->GetPageScale();
- Size aPagSize(basegfx::fround(rPageScale.getX()), basegfx::fround(rPageScale.getY()));
- Size aGrfSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(),
- aGraphic.GetPrefMapMode(), MAP_100TH_MM ) );
-
- aPagSize.Width() -= pPage->GetLeftPageBorder() + pPage->GetRightPageBorder();
- aPagSize.Height() -= pPage->GetTopPageBorder() + pPage->GetBottomPageBorder();
+ const Size aPagSize(
+ basegfx::fround(pPage->GetInnerPageScale().getX()),
+ basegfx::fround(pPage->GetInnerPageScale().getY()));
+ Size aGrfSize(
+ OutputDevice::LogicToLogic(
+ aGraphic.GetPrefSize(),
+ aGraphic.GetPrefMapMode(),
+ MAP_100TH_MM ) );
// scale to fit page
if ( ( ( aGrfSize.Height() > aPagSize.Height() ) || ( aGrfSize.Width() > aPagSize.Width() ) ) &&
@@ -240,19 +241,19 @@ sal_Bool SdGRFFilter::Import()
// Grafik an Pagesize anpassen (skaliert)
if( fGrfWH < fWinWH )
{
- aGrfSize.Width() = (long) ( aPagSize.Height() * fGrfWH );
+ aGrfSize.Width() = basegfx::fround( aPagSize.Height() * fGrfWH );
aGrfSize.Height() = aPagSize.Height();
}
else if( fGrfWH > 0.F )
{
aGrfSize.Width() = aPagSize.Width();
- aGrfSize.Height()= (long) ( aPagSize.Width() / fGrfWH );
+ aGrfSize.Height()= basegfx::fround( aPagSize.Width() / fGrfWH );
}
}
// Ausgaberechteck fuer Grafik setzen
- aPos.X() = ( ( aPagSize.Width() - aGrfSize.Width() ) >> 1 ) + pPage->GetLeftPageBorder();
- aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + pPage->GetTopPageBorder();
+ aPos.X() = ( ( aPagSize.Width() - aGrfSize.Width() ) >> 1 ) + basegfx::fround(pPage->GetLeftPageBorder());
+ aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + basegfx::fround(pPage->GetTopPageBorder());
SdrGrafObj* pNewSdrGraf = new SdrGrafObj(
pPage->getSdrModelFromSdrPage(),
Modified: openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.cxx Thu Aug 8 15:01:55 2013
@@ -845,7 +845,7 @@ void HtmlExport::SetDocColors( SdPage* p
///////////////////////////////////////////////////////////////////////
-void HtmlExport::InitProgress( sal_uInt16 nProgrCount )
+void HtmlExport::InitProgress( sal_uInt32 nProgrCount )
{
String aStr(SdResId(STR_CREATE_PAGES));
mpProgress = new SfxProgress( mpDocSh, aStr, nProgrCount );
@@ -1240,13 +1240,13 @@ String HtmlExport::CreateTextForPage( Sd
sal_Int16 nActDepth = -1;
String aParaText;
- for (sal_uLong nPara = 0; nPara < nCount; nPara++)
+ for (sal_uInt16 nPara = 0; nPara < nCount; nPara++)
{
pPara = pOutliner->GetParagraph(nPara);
if(pPara == 0)
continue;
- const sal_Int16 nDepth = (sal_uInt16) pOutliner->GetDepth( (sal_uInt16) nPara );
+ const sal_Int16 nDepth = (sal_uInt16) pOutliner->GetDepth( nPara );
aParaText = ParagraphToHTMLString(pOutliner,nPara,rBackgroundColor);
if(aParaText.Len() == 0)
@@ -1331,8 +1331,8 @@ String HtmlExport::CreateTextForNotesPag
pOutliner->Clear();
pOutliner->SetText( *pOPO );
- sal_uLong nCount = pOutliner->GetParagraphCount();
- for (sal_uLong nPara = 0; nPara < nCount; nPara++)
+ sal_uInt16 nCount = pOutliner->GetParagraphCount();
+ for (sal_uInt16 nPara = 0; nPara < nCount; nPara++)
{
aStr.AppendAscii("<p style=\"");
aStr.Append( getParagraphStyle( pOutliner, nPara ) );
@@ -1642,14 +1642,14 @@ bool HtmlExport::CreateHtmlForPresPages(
Rectangle aRect(sdr::legacy::GetBoundRect(*pObject));
Point aLogPos(aRect.TopLeft());
bool bIsSquare = aRect.GetWidth() == aRect.GetHeight();
-
- sal_uLong nPageWidth = pPage->GetPageScale().getX() - pPage->GetLeftPageBorder() - pPage->GetRightPageBorder();
+ const sal_Int32 nLeftPageBorder(basegfx::fround(pPage->GetLeftPageBorder()));
+ const sal_Int32 nTopPageBorder(basegfx::fround(pPage->GetTopPageBorder()));
// das BoundRect bezieht sich auf den physikalischen
// Seitenursprung, nicht auf den Koordinatenursprung
- aRect.Move(-pPage->GetLeftPageBorder(), -pPage->GetTopPageBorder());
+ aRect.Move(-nLeftPageBorder, -nTopPageBorder);
- double fLogicToPixel = ((double)mnWidthPixel) / nPageWidth;
+ const double fLogicToPixel((double)mnWidthPixel / pPage->GetInnerPageScale().getX());
aRect.Left() = (long)(aRect.Left() * fLogicToPixel);
aRect.Top() = (long)(aRect.Top() * fLogicToPixel);
aRect.Right() = (long)(aRect.Right() * fLogicToPixel);
@@ -1705,8 +1705,7 @@ bool HtmlExport::CreateHtmlForPresPages(
GetRectangle(false));
// Umrechnung in Pixelkoordinaten
- aArea.Move(aLogPos.X() - pPage->GetLeftPageBorder(),
- aLogPos.Y() - pPage->GetTopPageBorder());
+ aArea.Move(aLogPos.X() - nLeftPageBorder, aLogPos.Y() - nTopPageBorder);
aArea.Left() = (long)(aArea.Left() * fLogicToPixel);
aArea.Top() = (long)(aArea.Top() * fLogicToPixel);
aArea.Right() = (long)(aArea.Right() * fLogicToPixel);
@@ -1720,8 +1719,7 @@ bool HtmlExport::CreateHtmlForPresPages(
{
Point aCenter(((IMapCircleObject*)pArea)->
GetCenter(false));
- aCenter += Point(aLogPos.X() - pPage->GetLeftPageBorder(),
- aLogPos.Y() - pPage->GetTopPageBorder());
+ aCenter += Point(aLogPos.X() - nLeftPageBorder, aLogPos.Y() - nTopPageBorder);
aCenter.X() = (long)(aCenter.X() * fLogicToPixel);
aCenter.Y() = (long)(aCenter.Y() * fLogicToPixel);
@@ -1738,7 +1736,11 @@ bool HtmlExport::CreateHtmlForPresPages(
{
Polygon aArea(((IMapPolygonObject*)pArea)->GetPolygon(false));
const basegfx::B2DPolyPolygon aPolyPolygon(aArea.getB2DPolygon());
- aStr += CreateHTMLPolygonArea(aPolyPolygon, Size(aLogPos.X() - pPage->GetLeftPageBorder(), aLogPos.Y() - pPage->GetTopPageBorder()), fLogicToPixel, aURL);
+ aStr += CreateHTMLPolygonArea(
+ aPolyPolygon,
+ Size(aLogPos.X() - nLeftPageBorder, aLogPos.Y() - nTopPageBorder),
+ fLogicToPixel,
+ aURL);
}
break;
@@ -1846,7 +1848,11 @@ bool HtmlExport::CreateHtmlForPresPages(
{
const basegfx::B2DPolyPolygon aPolyPolygon(static_cast< SdrPathObj* >(pObject)->getB2DPolyPolygonInObjectCoordinates());
- aStr += CreateHTMLPolygonArea(aPolyPolygon, Size(-pPage->GetLeftPageBorder(), -pPage->GetTopPageBorder()), fLogicToPixel, aHRef);
+ aStr += CreateHTMLPolygonArea(
+ aPolyPolygon,
+ Size(-nLeftPageBorder, - nTopPageBorder),
+ fLogicToPixel,
+ aHRef);
}
// was anderes: das BoundRect nehmen
else
Modified: openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/filter/html/htmlex.hxx Thu Aug 8 15:01:55 2013
@@ -208,7 +208,7 @@ class HtmlExport
bool CopyFile( const String& rSourceFile, const String& rDestPath );
bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false );
- void InitProgress( sal_uInt16 nProgrCount );
+ void InitProgress( sal_uInt32 nProgrCount );
void ResetProgress();
String WriteMetaCharset() const;
Modified: openoffice/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx Thu Aug 8 15:01:55 2013
@@ -571,7 +571,7 @@ sal_Bool ImplSdPPTImport::Import()
for ( sal_uInt32 nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ )
{
- SetPageNum( nMasterNum, PPT_MASTERPAGE );
+ SetPageNum( static_cast< sal_uInt16 >(nMasterNum), PPT_MASTERPAGE );
SdPage* pPage = (SdPage*)MakeBlancPage( true );
if ( pPage )
{
@@ -733,7 +733,7 @@ sal_Bool ImplSdPPTImport::Import()
sal_uInt32 i;
for ( i = 0; i < mpDoc->GetMasterPageCount() && ( (pMPage = (SdPage*)mpDoc->GetMasterPage( i )) != 0 ); i++ )
{
- SetPageNum( i, PPT_MASTERPAGE );
+ SetPageNum( static_cast< sal_uInt16 >(i), PPT_MASTERPAGE );
/////////////////////////////////////////////
// importing master page objects //
/////////////////////////////////////////////
@@ -1047,14 +1047,14 @@ sal_Bool ImplSdPPTImport::Import()
pSdrModel->InsertPage( pPage );
// #i37397#, trying to set the title master for the first page
- sal_uInt16 nMaster, nMasterCount = pSdrModel->GetMasterPageCount();
+ sal_uInt32 nMaster, nMasterCount = pSdrModel->GetMasterPageCount();
SdPage* pFoundMaster = NULL;
for ( nMaster = 1; nMaster < nMasterCount; nMaster++ )
{
SdPage* pMaster = static_cast<SdPage*>( pSdrModel->GetMasterPage( nMaster ) );
if ( pMaster->GetPageKind() == PK_STANDARD )
{
- SetPageNum( nMaster, PPT_MASTERPAGE );
+ SetPageNum( static_cast< sal_uInt16 >(nMaster), PPT_MASTERPAGE );
if ( !pFoundMaster )
pFoundMaster = pMaster;
else if ( GetSlideLayoutAtom()->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE )
@@ -1088,7 +1088,7 @@ sal_Bool ImplSdPPTImport::Import()
////////////////////
// set AutoLayout //
////////////////////
- SetPageNum( i, PPT_SLIDEPAGE );
+ SetPageNum( static_cast< sal_uInt16 >(i), PPT_SLIDEPAGE );
SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD );
AutoLayout eAutoLayout = AUTOLAYOUT_NONE;
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
@@ -2396,10 +2396,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj
break;
}
}
-// [Bug 119962] Placeholder in ppt file created by MS 2007 is lost if load in Impress
- unsigned int nParaCount = pTextObj->Count();
- PPTParagraphObj *pFirstPara = nParaCount == 0 ? NULL : pTextObj->First();
- unsigned int nFirstParaTextcount = pFirstPara == NULL ? 0 : pFirstPara->GetTextSize();
+// [Bug 119962] Placeholder in ppt file created by MS 2007 is lost if load in Impress
+ unsigned int nParaCount = pTextObj->Count();
+ PPTParagraphObj *pFirstPara = nParaCount == 0 ? NULL : pTextObj->First();
+ unsigned int nFirstParaTextcount = pFirstPara == NULL ? 0 : pFirstPara->GetTextSize();
if ( i < 8 || (nParaCount == 1 && nFirstParaTextcount == 0 || nParaCount == 0))
{
PresObjKind ePresObjKind = PRESOBJ_NONE;
Modified: openoffice/branches/alg/aw080/main/sd/source/filter/xml/sdtransform.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/filter/xml/sdtransform.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/filter/xml/sdtransform.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/filter/xml/sdtransform.cxx Thu Aug 8 15:01:55 2013
@@ -107,8 +107,8 @@ void SdTransformOOo2xDocument::transform
void SdTransformOOo2xDocument::transformMasterPages()
{
- sal_uInt16 nMasterPageCount = mrDocument.GetMasterPageCount();
- for( sal_uInt16 nMasterPage = 0; nMasterPage < nMasterPageCount; nMasterPage++ )
+ sal_uInt32 nMasterPageCount = mrDocument.GetMasterPageCount();
+ for( sal_uInt32 nMasterPage = 0; nMasterPage < nMasterPageCount; nMasterPage++ )
{
SdrObjList* pPage = mrDocument.GetMasterPage( nMasterPage );
if( pPage )
@@ -118,8 +118,8 @@ void SdTransformOOo2xDocument::transform
void SdTransformOOo2xDocument::transformDrawPages()
{
- sal_uInt16 nPageCount = mrDocument.GetPageCount();
- for( sal_uInt16 nPage = 0; nPage < nPageCount; nPage++ )
+ sal_uInt32 nPageCount = mrDocument.GetPageCount();
+ for( sal_uInt32 nPage = 0; nPage < nPageCount; nPage++ )
{
SdrObjList* pPage = mrDocument.GetPage( nPage );
if( pPage )
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx Thu Aug 8 15:01:55 2013
@@ -58,7 +58,7 @@ namespace accessibility {
AccessibleSlideSorterObject::AccessibleSlideSorterObject(
const Reference<XAccessible>& rxParent,
::sd::slidesorter::SlideSorter& rSlideSorter,
- sal_uInt16 nPageNumber)
+ sal_uInt32 nPageNumber)
: AccessibleSlideSorterObjectBase(::sd::MutexOwner::maMutex),
mxParent(rxParent),
mnPageNumber(nPageNumber),
@@ -79,7 +79,7 @@ AccessibleSlideSorterObject::~Accessible
-sal_uInt16 AccessibleSlideSorterObject::GetPageNumber (void) const
+sal_uInt32 AccessibleSlideSorterObject::GetPageNumber (void) const
{
return mnPageNumber;
}
@@ -265,7 +265,7 @@ Reference<XAccessibleStateSet> SAL_CALL
// Conditional states.
if (mrSlideSorter.GetController().GetPageSelector().IsPageSelected(mnPageNumber))
pStateSet->AddState(AccessibleStateType::SELECTED);
- if (mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex() == mnPageNumber)
+ if (mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex() == static_cast< sal_Int32 >(mnPageNumber))
if (mrSlideSorter.GetController().GetFocusManager().IsFocusShowing())
pStateSet->AddState(AccessibleStateType::FOCUSED);
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationCreateDialog.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationCreateDialog.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationCreateDialog.cxx Thu Aug 8 15:01:55 2013
@@ -557,11 +557,11 @@ CustomAnimationCreateDialog::CustomAnima
// select current preset if available
if( rsPresetId.getLength() != 0 )
{
- for( sal_uInt16 i = ENTRANCE; i <= MOTIONPATH; i++ )
+ for( sal_uInt32 i = ENTRANCE; i <= MOTIONPATH; i++ )
{
if( mpTabPages[i]->select( rsPresetId ) )
{
- mpTabControl->SetCurPageId( RID_TP_CUSTOMANIMATION_ENTRANCE + i );
+ mpTabControl->SetCurPageId( static_cast< sal_uInt16 >(RID_TP_CUSTOMANIMATION_ENTRANCE + i ));
break;
}
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/animations/SlideTransitionPane.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/animations/SlideTransitionPane.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/animations/SlideTransitionPane.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/animations/SlideTransitionPane.cxx Thu Aug 8 15:01:55 2013
@@ -1213,7 +1213,7 @@ IMPL_LINK( SlideTransitionPane, ApplyToA
::sd::slidesorter::SharedPageSelection pPages (
new ::sd::slidesorter::SlideSorterViewShell::PageSelection());
- sal_uInt16 nPageCount = mpDrawDoc->GetSdPageCount( PK_STANDARD );
+ sal_uInt32 nPageCount = mpDrawDoc->GetSdPageCount( PK_STANDARD );
pPages->reserve( nPageCount );
for( sal_uInt32 i=0; i<nPageCount; ++i )
{
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.cxx Thu Aug 8 15:01:55 2013
@@ -453,13 +453,14 @@ void MotionPathTag::Notify( SfxBroadcast
// --------------------------------------------------------------------
-void MotionPathTag::MovePath( int nDX, int nDY )
+void MotionPathTag::MovePath( double fDX, double fDY )
{
- if( mpPathObj )
- {
- sdr::legacy::MoveSdrObject(*mpPathObj, Size( nDX, nDY ) );
- mrView.SetMarkHandles();
- }
+ if(mpPathObj)
+ {
+ mpPathObj->setSdrObjectTransformation(basegfx::tools::createTranslateB2DHomMatrix(fDX, fDY) * mpPathObj->getSdrObjectTransformation());
+ // sdr::legacy::MoveSdrObject(*mpPathObj, Size( nDX, nDY ) );
+ mrView.SetMarkHandles(); // TTTT: Neded?
+ }
}
// --------------------------------------------------------------------
@@ -717,33 +718,33 @@ bool MotionPathTag::OnMarkHandle( const
bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
{
- long nX = 0;
- long nY = 0;
+ double fX = 0.0;
+ double fY = 0.0;
switch( rKEvt.GetKeyCode().GetCode() )
{
- case KEY_UP: nY = -1; break;
- case KEY_DOWN: nY = 1; break;
- case KEY_LEFT: nX = -1; break;
- case KEY_RIGHT: nX = 1; break;
- default: break;
+ case KEY_UP: fY = -1.0; break;
+ case KEY_DOWN: fY = 1.0; break;
+ case KEY_LEFT: fX = -1.0; break;
+ case KEY_RIGHT: fX = 1.0; break;
+ default: break;
}
if(rKEvt.GetKeyCode().IsMod2())
{
OutputDevice* pOut = mrView.GetViewShell()->GetActiveWindow();
Size aLogicSizeOnePixel = (pOut) ? pOut->PixelToLogic(Size(1,1)) : Size(100, 100);
- nX *= aLogicSizeOnePixel.Width();
- nY *= aLogicSizeOnePixel.Height();
+ fX *= aLogicSizeOnePixel.Width();
+ fY *= aLogicSizeOnePixel.Height();
}
else
{
// old, fixed move distance
- nX *= 100;
- nY *= 100;
+ fX *= 100.0;
+ fY *= 100.0;
}
- if( nX || nY )
+ if( !basegfx::fTools::equalZero(fX) || !basegfx::fTools::equalZero(fY) )
{
// in point edit mode move the handle with the focus
const SdrHdlList& rHdlList = mrView.GetHdlList();
@@ -751,9 +752,9 @@ bool MotionPathTag::OnMove( const KeyEve
if(pHdl)
{
- // now move the Handle (nX, nY)
+ // now move the Handle (fX, fY)
const basegfx::B2DPoint aStartPoint(pHdl->getPosition());
- const basegfx::B2DPoint aEndPoint(aStartPoint + basegfx::B2DPoint(nX, nY));
+ const basegfx::B2DPoint aEndPoint(aStartPoint + basegfx::B2DPoint(fX, fY));
// start dragging
rtl::Reference< MotionPathTag > xTag( this );
@@ -797,7 +798,7 @@ bool MotionPathTag::OnMove( const KeyEve
else
{
// move the path
- MovePath( nX, nY );
+ MovePath( fX, fY );
}
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/animations/motionpathtag.hxx Thu Aug 8 15:01:55 2013
@@ -89,7 +89,7 @@ public:
virtual bool IsOpenCloseMarkedObjectsPossible() const;
virtual SdrObjClosedKind GetMarkedObjectsClosedState() const;
- void MovePath( int nDX, int nDY );
+ void MovePath( double fDX, double fDY );
bool OnDelete();
bool OnTabHandles( const KeyEvent& rKEvt );
bool OnMarkHandle( const KeyEvent& rKEvt );
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationmanager.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationmanager.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationmanager.cxx Thu Aug 8 15:01:55 2013
@@ -381,7 +381,7 @@ void AnnotationManagerImpl::InsertAnnota
AnnotationVector aAnnotations( pPage->getAnnotations() );
if( !aAnnotations.empty() )
{
- const int page_width = pPage->GetPageScale().getX();
+ const int page_width = basegfx::fround(pPage->GetPageScale().getX());
const int width = 1000;
const int height = 800;
Rectangle aTagRect;
@@ -1209,7 +1209,7 @@ SdPage* AnnotationManagerImpl::GetNextPa
}
else
{
- if( nPageNum == (mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? 0 : 1 )
+ if( nPageNum == sal_uInt32(mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? 0 : 1 )
{
// we reached beginning of master pages, start with end if pages
return mpDoc->GetSdPage( mpDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD );
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.cxx Thu Aug 8 15:01:55 2013
@@ -422,7 +422,7 @@ bool AnnotationTag::Command( const Comma
return false;
}
-void AnnotationTag::Move( int nDX, int nDY )
+void AnnotationTag::Move( double fDX, double fDY )
{
if( mxAnnotation.is() )
{
@@ -430,8 +430,8 @@ void AnnotationTag::Move( int nDX, int n
mrManager.GetDoc()->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_MOVE ) ) );
RealPoint2D aPosition( mxAnnotation->getPosition() );
- aPosition.X += (double)nDX / 100.0;
- aPosition.Y += (double)nDY / 100.0;
+ aPosition.X += fDX / 100.0;
+ aPosition.Y += fDY / 100.0;
mxAnnotation->setPosition( aPosition );
if( mrManager.GetDoc()->IsUndoEnabled() )
@@ -443,15 +443,15 @@ void AnnotationTag::Move( int nDX, int n
bool AnnotationTag::OnMove( const KeyEvent& rKEvt )
{
- long nX = 0;
- long nY = 0;
+ double fX = 0.0;
+ double fY = 0.0;
switch( rKEvt.GetKeyCode().GetCode() )
{
- case KEY_UP: nY = -1; break;
- case KEY_DOWN: nY = 1; break;
- case KEY_LEFT: nX = -1; break;
- case KEY_RIGHT: nX = 1; break;
+ case KEY_UP: fY = -1.0; break;
+ case KEY_DOWN: fY = 1.0; break;
+ case KEY_LEFT: fX = -1.0; break;
+ case KEY_RIGHT: fX = 1.0; break;
default: break;
}
@@ -459,20 +459,20 @@ bool AnnotationTag::OnMove( const KeyEve
{
OutputDevice* pOut = mrView.GetViewShell()->GetActiveWindow();
Size aLogicSizeOnePixel = (pOut) ? pOut->PixelToLogic(Size(1,1)) : Size(100, 100);
- nX *= aLogicSizeOnePixel.Width();
- nY *= aLogicSizeOnePixel.Height();
+ fX *= aLogicSizeOnePixel.Width();
+ fY *= aLogicSizeOnePixel.Height();
}
else
{
// old, fixed move distance
- nX *= 100;
- nY *= 100;
+ fX *= 100.0;
+ fY *= 100.0;
}
- if( nX || nY )
+ if( !basegfx::fTools::equalZero(fX) || !basegfx::fTools::equalZero(fY) )
{
// move the annotation
- Move( nX, nY );
+ Move( fX, fY );
}
return true;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/annotations/annotationtag.hxx Thu Aug 8 15:01:55 2013
@@ -62,7 +62,7 @@ public:
virtual void CheckPossibilities();
virtual bool MarkPoints(const basegfx::B2DRange* pRange, bool bUnmark);
- void Move( int nDX, int nDY );
+ void Move( double fDX, double fDY );
bool OnMove( const KeyEvent& rKEvt );
// ---
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/app/tmplctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/app/tmplctrl.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/app/tmplctrl.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/app/tmplctrl.cxx Thu Aug 8 15:01:55 2013
@@ -135,7 +135,7 @@ void SdTemplateControl::Command( const C
{
const sal_uInt32 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD);
- sal_uInt32 nCount = 0;
+ sal_uInt16 nCount = 0;
for( sal_uInt32 nPage = 0; nPage < nMasterCount; ++nPage )
{
SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PK_STANDARD);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/dlg/dlgassim.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/dlg/dlgassim.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/dlg/dlgassim.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/dlg/dlgassim.cxx Thu Aug 8 15:01:55 2013
@@ -112,8 +112,8 @@ void SdPageListControl::Fill( SdDrawDocu
{
Outliner* pOutliner = pDoc->GetInternalOutliner();
- sal_uInt16 nPage = 0;
- const sal_uInt16 nMaxPages = pDoc->GetPageCount();
+ sal_uInt32 nPage = 0;
+ const sal_uInt32 nMaxPages = pDoc->GetPageCount();
while( nPage < nMaxPages )
{
SdPage* pPage = (SdPage*) pDoc->GetPage( nPage );
@@ -153,7 +153,7 @@ void SdPageListControl::Fill( SdDrawDocu
for (sal_uLong nPara = 0; nPara < nCount; nPara++)
{
pPara = pOutliner->GetParagraph(nPara);
- if(pPara && pOutliner->GetDepth( (sal_uInt16) nPara ) == 0 )
+ if(pPara && pOutliner->GetDepth( nPara ) == 0 )
{
String aParaText = pOutliner->GetText(pPara);
if(aParaText.Len() != 0)
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/dlg/docprev.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/dlg/docprev.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/dlg/docprev.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/dlg/docprev.cxx Thu Aug 8 15:01:55 2013
@@ -244,10 +244,9 @@ void SdDocPreviewWin::updateViewSettings
pView->SetPageVisible( false );
pView->ShowSdrPage( *pPage );
- const Point aNewOrg( pPage->GetLeftPageBorder(), pPage->GetTopPageBorder() );
+ const Point aNewOrg(basegfx::fround(pPage->GetLeftPageBorder()), basegfx::fround(pPage->GetTopPageBorder()));
const Size aSize(basegfx::fround(pPage->GetPageScale().getX()), basegfx::fround(pPage->GetPageScale().getY()));
- const Size aNewSize( aSize.Width() - pPage->GetLeftPageBorder() - pPage->GetRightPageBorder(),
- aSize.Height() - pPage->GetTopPageBorder() - pPage->GetBottomPageBorder() );
+ const Size aNewSize(basegfx::fround(pPage->GetInnerPageScale().getX()), basegfx::fround(pPage->GetInnerPageScale().getY()));
const Rectangle aClipRect( aNewOrg, aNewSize );
MapMode aVMap( aMap );
@@ -256,11 +255,11 @@ void SdDocPreviewWin::updateViewSettings
aVDev.SetRelativeMapMode( aVMap );
aVDev.IntersectClipRegion( aClipRect );
- // Use new StandardCheckVisisbilityRedirector
- StandardCheckVisisbilityRedirector aRedirector;
- const Rectangle aRedrawRectangle = Rectangle( Point(), aNewSize );
- Region aRedrawRegion(aRedrawRectangle);
- pView->SdrPaintView::CompleteRedraw(&aVDev,aRedrawRegion,&aRedirector);
+ // Use new StandardCheckVisisbilityRedirector
+ StandardCheckVisisbilityRedirector aRedirector;
+ const Rectangle aRedrawRectangle = Rectangle( Point(), aNewSize );
+ Region aRedrawRegion(aRedrawRectangle);
+ pView->SdrPaintView::CompleteRedraw(&aVDev,aRedrawRegion,&aRedirector);
aVDev.Pop();
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/dlg/present.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/dlg/present.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/dlg/present.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/dlg/present.cxx Thu Aug 8 15:01:55 2013
@@ -230,7 +230,7 @@ void SdStartPresentationDlg::InitMonitor
// Store display index together with name.
const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
- maLBMonitor.SetEntryData(nEntryIndex, (void*)nDisplay);
+ maLBMonitor.SetEntryData(static_cast< sal_uInt16 >(nEntryIndex), (void*)nDisplay);
// Remember the index of the default selection.
if (nDefaultSelectedDisplay == nDisplay)
@@ -245,7 +245,7 @@ void SdStartPresentationDlg::InitMonitor
{
maLBMonitor.InsertEntry( msAllMonitors );
const sal_uInt32 nEntryIndex (maLBMonitor.GetEntryCount()-1);
- maLBMonitor.SetEntryData(nEntryIndex, (void*)-1);
+ maLBMonitor.SetEntryData(static_cast< sal_uInt16 >(nEntryIndex), (void*)-1);
if (nDefaultSelectedDisplay == -1)
nSelectedIndex = nEntryIndex;
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdpreslt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdpreslt.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdpreslt.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdpreslt.cxx Thu Aug 8 15:01:55 2013
@@ -73,7 +73,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(
{
FreeResource();
- mpLayoutNames = new List;
+ //mpLayoutNames = new List;
maVS.SetDoubleClickHdl(LINK(this, SdPresLayoutDlg, ClickLayoutHdl));
maBtnLoad.SetClickHdl(LINK(this, SdPresLayoutDlg, ClickLoadHdl));
@@ -89,14 +89,14 @@ SdPresLayoutDlg::SdPresLayoutDlg(
SdPresLayoutDlg::~SdPresLayoutDlg()
{
- String* pName = (String*)mpLayoutNames->First();
- while (pName)
- {
- delete pName;
- pName = (String*)mpLayoutNames->Next();
- }
-
- delete mpLayoutNames;
+ //String* pName = (String*)mpLayoutNames->First();
+ //while (pName)
+ //{
+ // delete pName;
+ // pName = (String*)mpLayoutNames->Next();
+ //}
+ //
+ //delete mpLayoutNames;
}
/*************************************************************************
@@ -108,7 +108,7 @@ SdPresLayoutDlg::~SdPresLayoutDlg()
void SdPresLayoutDlg::Reset()
{
const SfxPoolItem *pPoolItem = NULL;
- long nName;
+ sal_uInt32 nName(0);
// MasterPage austauschen
if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, false, &pPoolItem ) == SFX_ITEM_SET )
@@ -128,15 +128,16 @@ void SdPresLayoutDlg::Reset()
FillValueSet();
- mnLayoutCount = mpLayoutNames->Count();
+ mnLayoutCount = maLayoutNames.size();
for( nName = 0; nName < mnLayoutCount; nName++ )
{
- if (*((String*)mpLayoutNames->GetObject(nName)) == maName)
+ if(maLayoutNames[nName] == maName)
+ //if (*((String*)mpLayoutNames->GetObject(nName)) == maName)
break;
}
DBG_ASSERT(nName < mnLayoutCount, "Layout nicht gefunden");
- maVS.SelectItem((sal_uInt16)nName + 1); // Inizes des ValueSets beginnen bei 1
+ maVS.SelectItem(static_cast< sal_uInt16 >(nName + 1)); // Inizes des ValueSets beginnen bei 1
}
@@ -158,11 +159,13 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet
{
aLayoutName = maName;
aLayoutName.Append( DOCUMENT_TOKEN );
- aLayoutName.Append( *(String*)mpLayoutNames->GetObject( nId - 1 ) );
+ //aLayoutName.Append( *(String*)mpLayoutNames->GetObject( nId - 1 ) );
+ aLayoutName.Append(maLayoutNames[nId - 1]);
}
else
{
- aLayoutName = *(String*)mpLayoutNames->GetObject( nId - 1 );
+ //aLayoutName = *(String*)mpLayoutNames->GetObject( nId - 1 );
+ aLayoutName = maLayoutNames[nId - 1];
if( aLayoutName == maStrNone )
aLayoutName.Erase(); // so wird "- keine -" codiert (s.u.)
}
@@ -190,19 +193,21 @@ void SdPresLayoutDlg::FillValueSet()
SdDrawDocument* pDoc = mpDocSh->GetDoc();
- sal_uInt16 nCount = pDoc->GetMasterPageCount();
+ sal_uInt32 nCount = pDoc->GetMasterPageCount();
- for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++)
+ for (sal_uInt32 nLayout = 0; nLayout < nCount; nLayout++)
{
SdPage* pMaster = (SdPage*)pDoc->GetMasterPage(nLayout);
if (pMaster->GetPageKind() == PK_STANDARD)
{
String aLayoutName(pMaster->GetLayoutName());
aLayoutName.Erase( aLayoutName.SearchAscii( SD_LT_SEPARATOR ) );
- mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND);
+ maLayoutNames.push_back(aLayoutName);
+ //mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND);
Bitmap aBitmap(mpDocSh->GetPagePreviewBitmap(pMaster, 90));
- maVS.InsertItem((sal_uInt16)mpLayoutNames->Count(), aBitmap, aLayoutName);
+ //maVS.InsertItem(mpLayoutNames->Count(), aBitmap, aLayoutName);
+ maVS.InsertItem(maLayoutNames.size(), aBitmap, aLayoutName);
}
}
@@ -273,23 +278,37 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl,
if( !bCancel )
{
// Pruefen, ob Vorlage schon vorhanden
+ // TTTT: check if this works and if yes, cleanup mpLayoutNames
+
bool bExists = false;
- String* pName = (String*)mpLayoutNames->First();
+ //String* pName = (String*)mpLayoutNames->First();
String aCompareStr( maName );
if( maName.Len() == 0 )
aCompareStr = maStrNone;
- while( pName && !bExists )
- {
- if( aCompareStr == *pName )
- {
- bExists = true;
- // Vorlage selektieren
- sal_uInt16 nId = (sal_uInt16) mpLayoutNames->GetCurPos() + 1;
- maVS.SelectItem( nId );
- }
- pName = (String*)mpLayoutNames->Next();
- }
+ for(sal_uInt32 a(0); !bExists && a < maLayoutNames.size(); a++)
+ {
+ if(aCompareStr == maLayoutNames[a])
+ {
+ bExists = true;
+
+ // select template
+ // const sal_uInt16 nId(static_cast< sal_uInt16 >(a + 1);
+ maVS.SelectItem(static_cast< sal_uInt16 >(a + 1));
+ }
+ }
+
+ //while( pName && !bExists )
+ //{
+ // if( aCompareStr == *pName )
+ // {
+ // bExists = true;
+ // // Vorlage selektieren
+ // sal_uInt16 nId = (sal_uInt16) mpLayoutNames->GetCurPos() + 1;
+ // maVS.SelectItem( nId );
+ // }
+ // pName = (String*)mpLayoutNames->Next();
+ //}
if( !bExists )
{
@@ -310,19 +329,21 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl,
Bitmap aBitmap( pTemplDocSh->GetPagePreviewBitmap( pMaster, 90 ) );
maVS.InsertItem( (sal_uInt16) mpLayoutNames->Count(), aBitmap, maName);
*/
- sal_uInt16 nCount = pTemplDoc->GetMasterPageCount();
+ sal_uInt32 nCount = pTemplDoc->GetMasterPageCount();
- for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++)
+ for (sal_uInt32 nLayout = 0; nLayout < nCount; nLayout++)
{
SdPage* pMaster = (SdPage*) pTemplDoc->GetMasterPage(nLayout);
if (pMaster->GetPageKind() == PK_STANDARD)
{
String aLayoutName(pMaster->GetLayoutName());
aLayoutName.Erase( aLayoutName.SearchAscii( SD_LT_SEPARATOR ) );
- mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND);
+ //mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND);
+ maLayoutNames.push_back(aLayoutName);
Bitmap aBitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster, 90));
- maVS.InsertItem((sal_uInt16)mpLayoutNames->Count(), aBitmap, aLayoutName);
+ //maVS.InsertItem(mpLayoutNames->Count(), aBitmap, aLayoutName);
+ maVS.InsertItem(maLayoutNames.size(), aBitmap, aLayoutName);
}
}
}
@@ -336,15 +357,18 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl,
else
{
// leeres Layout
- mpLayoutNames->Insert( new String( maStrNone ), LIST_APPEND );
- maVS.InsertItem( (sal_uInt16) mpLayoutNames->Count(),
- Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone );
+ //mpLayoutNames->Insert( new String( maStrNone ), LIST_APPEND );
+ maLayoutNames.push_back(maStrNone);
+ //maVS.InsertItem( (sal_uInt16) mpLayoutNames->Count(),
+ // Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone );
+ maVS.InsertItem(maLayoutNames.size(), Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone );
}
if (!bCancel)
{
// Vorlage selektieren
- maVS.SelectItem( (sal_uInt16) mpLayoutNames->Count() );
+ //maVS.SelectItem( (sal_uInt16) mpLayoutNames->Count() );
+ maVS.SelectItem(static_cast< sal_uInt16 >(maLayoutNames.size()));
}
}
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdtreelb.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdtreelb.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdtreelb.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/dlg/sdtreelb.cxx Thu Aug 8 15:01:55 2013
@@ -416,7 +416,7 @@ void SdPageObjsTLB::Fill( const SdDrawDo
// first insert all pages including objects
sal_uInt16 nPage = 0;
- const sal_uInt16 nMaxPages = mpDoc->GetPageCount();
+ const sal_uInt32 nMaxPages = mpDoc->GetPageCount();
while( nPage < nMaxPages )
{
@@ -437,7 +437,7 @@ void SdPageObjsTLB::Fill( const SdDrawDo
if( mbShowAllPages )
{
nPage = 0;
- const sal_uInt16 nMaxMasterPages = mpDoc->GetMasterPageCount();
+ const sal_uInt32 nMaxMasterPages = mpDoc->GetMasterPageCount();
while( nPage < nMaxMasterPages )
{
@@ -645,7 +645,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const
// Alle Pages incl. Objekte vergleichen
sal_uInt16 nPage = 0;
- const sal_uInt16 nMaxPages = mpDoc->GetPageCount();
+ const sal_uInt32 nMaxPages = mpDoc->GetPageCount();
while( nPage < nMaxPages )
{
@@ -760,7 +760,7 @@ void SdPageObjsTLB::RequestingChilds( Sv
// only insert all "normal" ? slides with objects
sal_uInt16 nPage = 0;
- const sal_uInt16 nMaxPages = mpBookmarkDoc->GetPageCount();
+ const sal_uInt32 nMaxPages = mpBookmarkDoc->GetPageCount();
while( nPage < nMaxPages )
{
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel2.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel2.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel2.cxx Thu Aug 8 15:01:55 2013
@@ -238,6 +238,11 @@ FrameView* DrawDocShell::GetFrameView()
return(pFrameView);
}
+sd::ViewShell* DrawDocShell::GetViewShell()
+{
+ return mpViewShell;
+}
+
/*************************************************************************
|*
|* Groesse der ersten Seite zurueckgeben
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel4.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel4.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/docshell/docshel4.cxx Thu Aug 8 15:01:55 2013
@@ -879,7 +879,7 @@ bool DrawDocShell::GotoBookmark(const St
// by using the API because this takes care of all the
// little things to be done. Especially writing the view
// data to the frame view (see bug #107803#).
- sal_uInt16 nSdPgNum = (nPageNumber - 1) / 2;
+ sal_uInt32 nSdPgNum = (nPageNumber - 1) / 2;
Reference<drawing::XDrawView> xController (rBase.GetController(), UNO_QUERY);
if (xController.is())
{