[Libreoffice-commits] .: 2 commits - sd/source svtools/source
sd/source/ui/view/drviews2.cxx | 13 ++---
svtools/source/contnr/imivctl1.cxx | 16 ++--
2 files changed, 8 insertions(+), 21 deletions(-)
New commits:
commit 3b887c8d3fef676e0037a4f3381f6a491ec0da4f
Author: Rafael Dominguez
Date: Sat Mar 31 21:12:50 2012 -0430
Replace deprecated List for std::vector.
diff --git a/svtools/source/contnr/imivctl1.cxx
b/svtools/source/contnr/imivctl1.cxx
index eec11d1..4cbaa46 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3558,25 +3558,13 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode(
SvxIconChoiceCtrlPositionMode eMod
if( ePositionMode == IcnViewPositionModeAutoArrange )
{
-List aMovedEntries;
for( size_t nCur = 0; nCur < nCount; nCur++ )
{
SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
if( pEntry->GetFlags() & (ICNVIEW_FLAG_POS_LOCKED |
ICNVIEW_FLAG_POS_MOVED))
-{
-SvxIconChoiceCtrlEntry_Impl* pE = new
SvxIconChoiceCtrlEntry_Impl(
-pEntry, GetEntryBoundRect( pEntry ));
-aMovedEntries.Insert( pE, LIST_APPEND );
-}
+SetEntryPos(pEntry, GetEntryBoundRect( pEntry ).TopLeft());
}
-nCount = aMovedEntries.Count();
-for( size_t nCur = 0; nCur < nCount; nCur++ )
-{
-SvxIconChoiceCtrlEntry_Impl* pE =
(SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject(nCur);
-SetEntryPos( pE->_pEntry, pE->_aPos );
-}
-for( size_t nCur = 0; nCur < nCount; nCur++ )
-delete (SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject( nCur
);
+
if( aEntries.size() )
aAutoArrangeTimer.Start();
}
commit a9a05a06ac275ec2695ff607ed118e1b46ab7a4e
Author: Rafael Dominguez
Date: Thu Mar 29 19:26:11 2012 -0430
Replace deprecated List for vector.
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 179fe66..6ecad4c 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -804,7 +804,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
// der harten Attribute sowie der UserCall eingetragen, da
diese beim nachfolgenden
// mpDrawView->SetAttributes( *pSet, sal_True ) verloren gehen
und spaeter restauriert
// werden muessen
-List* pAttrList = new List();
+std::vector > aAttrList;
SdPage* pPresPage = (SdPage*)
mpDrawView->GetSdrPageView()->GetPage();
sal_uLong i;
@@ -816,8 +816,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
SfxItemSet* pNewSet = new SfxItemSet(
GetDoc()->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
0 );
pNewSet->Put(pObj->GetMergedItemSet());
-pAttrList->Insert( pNewSet, LIST_APPEND );
-pAttrList->Insert( pObj->GetUserCall(), LIST_APPEND );
+aAttrList.push_back(std::make_pair(pNewSet,
pObj->GetUserCall()));
}
}
@@ -857,8 +856,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if( pPresPage->IsPresObj( pObj ) )
{
-SfxItemSet* pNewSet = (SfxItemSet*)
pAttrList->GetObject(j++);
-SdrObjUserCall* pUserCall = (SdrObjUserCall*)
pAttrList->GetObject(j++);
+std::pair &rAttr =
aAttrList[j++];
+
+SfxItemSet* pNewSet = rAttr.first;
+SdrObjUserCall* pUserCall = rAttr.second;
if ( pNewSet && pNewSet->GetItemState(
SDRATTR_TEXT_MINFRAMEHEIGHT ) == SFX_ITEM_ON )
{
@@ -876,8 +877,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
delete pNewSet;
}
}
-
-delete pAttrList;
}
delete pSet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/chart_errorbars' - 6 commits - chart2/source xmloff/inc xmloff/source
chart2/source/controller/dialogs/DataBrowserModel.cxx | 41
chart2/source/controller/dialogs/DataBrowserModel.hxx |2
chart2/source/view/charttypes/VSeriesPlotter.cxx |7
chart2/source/view/inc/VDataSeries.hxx|2
chart2/source/view/main/VDataSeries.cxx | 15 +
xmloff/inc/xmloff/xmltoken.hxx|1
xmloff/source/chart/PropertyMap.hxx |8
xmloff/source/chart/SchXMLExport.cxx | 176 +++---
xmloff/source/core/xmltoken.cxx |2
9 files changed, 153 insertions(+), 101 deletions(-)
New commits:
commit 7d56619bba0d8b250f8b0367e2b817b2678b52e0
Author: Rafael Dominguez
Date: Sun Apr 8 19:10:23 2012 -0430
Export errorbars attributes and styles to XML.
- Instead of exporting the errorbar data to the series in a global way now
each errorbar has its own attributes depending on their user settings,
so we can have different data for each type bar (only when using ODF 1.2
extended) and still keeping it backward compatible with old formats.
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index ee535b1..06b143c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3124,7 +3124,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const
Reference
xNewDoc(mrExport.GetModel(), uno::UNO_QUERY);
+
// register data ranges for error bars for export in local
table
::std::vector< Reference< chart2::data::XDataSequence > >
aErrorBarSequences(
lcl_getErrorBarSequences( xErrorBarProp ));
for( ::std::vector< Reference< chart2::data::XDataSequence >
>::const_iterator aIt(
aErrorBarSequences.begin()); aIt !=
aErrorBarSequences.end(); ++aIt )
{
+if ( nCurrentVersion == SvtSaveOptions::ODFVER_LATEST )
+{
+rtl::OUString aRole, aRange;
+Reference< beans::XPropertySet > xSeqProp( *aIt,
uno::UNO_QUERY_THROW );
+xSeqProp->getPropertyValue("Role") >>= aRole;
+
+aRange =
lcl_ConvertRange((*aIt)->getSourceRangeRepresentation(), xNewDoc );
+
+if ( aRole.indexOf("positive") != -1 )
+{
+if ( bPositive )
+mrExport.AddAttribute( XML_NAMESPACE_CHART,
XML_ERROR_UPPER_RANGE, aRange );
+}
+else
+{
+if ( bNegative )
+mrExport.AddAttribute( XML_NAMESPACE_CHART,
XML_ERROR_LOWER_RANGE, aRange );
+}
+}
+
m_aDataSequencesToExport.push_back( tLabelValuesDataPair(
0, *aIt ));
}
}
commit 45d49253f6b062a320640b660e49a500434d87f5
Author: Rafael Dominguez
Date: Sun Apr 8 19:08:19 2012 -0430
Map errorbars properties from chart2 API to xml.
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index f241023..15db15f 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -3149,6 +3149,7 @@ namespace xmloff { namespace token {
XML_HORIZONTAL_BAR,
XML_VERTICAL_BAR,
+XML_ERROR_STANDARD_WEIGTH, // errorbar standard deviation error weigth
XML_TOKEN_END
};
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index d0aab8b..f293b79 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -94,6 +94,7 @@
#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId,
EarliestODFVersionForExport ) { ApiName, sizeof(ApiName)-1,
XML_NAMESPACE_##NameSpace, xmloff::token::XMLTokenName,
XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport }
#define MAP_ENTRY( a, ns, nm, t ){ a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_010 }
#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_012 }
+#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ){ a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_LATEST }
#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c,
SvtSaveOptions::ODFVER_010 }
#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART |
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010 }
#define MAP_SPECIAL_
[Libreoffice-commits] .: sd/source
sd/source/ui/inc/sprite.hxx | 91
1 file changed, 91 deletions(-)
New commits:
commit bcf0c0ead1a2459606cd8df90cddd40e944f91de
Author: Rafael Dominguez
Date: Sat Mar 24 14:46:57 2012 -0430
Remove unused class.
diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx
deleted file mode 100644
index d67163e..000
--- a/sd/source/ui/inc/sprite.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef SD_SPRITE_HXX
-#define SD_SPRITE_HXX
-
-#include
-#include
-#include
-#include
-#include
-
-// --
-// - Sprite -
-// --
-
-
-namespace sd {
-
-class Marker;
-class MetaFile;
-
-class Sprite
-{
-public:
-Sprite( List* pListOfBmpEx );
-~Sprite();
-
-sal_BoolStartMoving( OutputDevice* pOut,
- OutputDevice* pBottomLayer = NULL,
- BitmapEx* pTopLayer = NULL,
- MetaFile** ppTopMtf = NULL,
- Marker* pObjStartMarker = NULL,
- Marker* pObjEndMarker = NULL );
-voidMoveTo( OutputDevice* pOut, const Point& rPt, const Size*
pSz = NULL );
-voidMoveTo( OutputDevice* pOut, const Point& rPt, const
double& rScaleX, const double& rScaleY );
-voidEndMoving( OutputDevice* pOut );
-
-protected:
-MapMode aOldMap;
-Region aOldClip;
-Rectangle aPaintRect;
-Point aPt;
-SizeaSz;
-Point aLayerOffsetPix;
-VirtualDevice* pPaintDev;
-VirtualDevice* pBottomLayer;
-BitmapEx* pActBmpEx;
-BitmapEx* pTopLayer;
-MetaFile** ppTopMtf;
-Marker* pObjStartMarker;
-Marker* pObjEndMarker;
-List* pListOfBmpEx;
-sal_uLong nLastTime;
-sal_BoolbClipRegion;
-
-sal_BoolImplPrepareMoveTo();
-voidImplDrawSprite( OutputDevice* pOut, const Point& rPt,
const Size& rSz );
-
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/chart_errorbars'
New branch 'feature/chart_errorbars' available with the following commits: commit 0b93365cc7da522d9bb2cdd9d9b8d3aff0ef8bfa Author: Rafael Dominguez Date: Sun Mar 18 00:14:48 2012 + Remove deprecated chart ObjectType OBJECTTYPE_DATA_ERRORS. commit c2343cc5952fbffca3b985125fe2f3f1e71457b8 Author: Rafael Dominguez Date: Sat Mar 17 23:31:00 2012 + Create separate shape groups for each errorbar type. commit c9b2a714538aa6c9f80a134aaa1ad64661c5e435 Author: Rafael Dominguez Date: Sat Mar 17 20:40:39 2012 + Set correct objecttype for errorbar. commit 8541a41c7195a196074dc9e8b0c9b1147e8d9185 Author: Rafael Dominguez Date: Sat Mar 17 20:40:01 2012 + Display Format menu entry when selecting an X errorbar. commit cfe0cea6e68e5f4cedbe0360fcb4bca26f88e722 Author: Rafael Dominguez Date: Sat Mar 17 17:15:10 2012 + Get correct datasource when calculating errorbar length. commit e8d2a06ccca579630c9712c421dd272e11c50bf7 Author: Rafael Dominguez Date: Sat Mar 17 15:13:55 2012 + Update DeleteYErrorbar function to handle X and Y bars. commit 197ddb777bde2556061850dc98d3163f81c49f4f Author: Rafael Dominguez Date: Sat Mar 17 14:36:02 2012 + Set errorbar type attribute when inserting or formating an errorbar. commit 63c517f70c1802cd36dcde6d33df16ae05b630d8 Author: Rafael Dominguez Date: Sat Mar 17 14:32:05 2012 + Return correct ItemConverter object for any errorbar type. commit 0c44946ade3d493aa8a2cd49d1d835fa1fabfc5e Author: Rafael Dominguez Date: Sat Mar 17 14:30:06 2012 + Enable support to format chart errorbars. commit d643450cf2ef50e0d51e2f7a1f7f99b7d4d8b9f5 Author: Rafael Dominguez Date: Sat Mar 17 12:54:20 2012 + Handle case XErrorbars in ErrorBarItemConverter::ApplySpecialItem. commit f70e933e14885b5b4948fc3c73387cc4b59b643f Author: Rafael Dominguez Date: Sat Mar 17 12:48:51 2012 + Allow deleting any chart errorbar and set correct action description. commit b3be3265e9583c5686ff472421d2ad490095841f Author: Rafael Dominguez Date: Sat Mar 17 10:34:44 2012 + Determine ranges correctly for any type of chart errorbar object. commit 867578f629c6cf91bec8423beb355c919ee2943a Author: Rafael Dominguez Date: Sat Mar 17 10:30:27 2012 + Add FormatXErrorBar, DeleteXErrorBar menu entries in chart. -Update ModelState to reflect the changes. commit d3c465be320d2556618ac4b73f8dff38ccd6e3a1 Author: Rafael Dominguez Date: Sat Mar 17 09:44:52 2012 + Display XErrorBars in object hierarchy. commit b247d124fa6b386787399ef203cf2f7a4c61378a Author: Rafael Dominguez Date: Fri Mar 16 19:29:07 2012 + Return the correct errorbar property set. Select the errorbar propertyset according to the errorbar direction instead of only using Y errorbar propertyset in ObjectIdentifier::getObjectPropertySet function. commit cf8c91fb2b692fa22399fefa98b24147027b2a64 Author: Rafael Dominguez Date: Fri Mar 16 18:42:36 2012 + Get correct errorbar CID depending on the direction. commit beed5cbbaa250b2093c8e4e0928a81c61c4c570f Author: Rafael Dominguez Date: Fri Mar 16 18:36:56 2012 + Enable statistics if chart has any type of errorbars. commit e55adf2e30198aaeba78740aa93bb5ec7ce9ff7e Author: Rafael Dominguez Date: Fri Mar 16 17:17:58 2012 + Specialize STR_OBJECT_ERROR_BARS for each errobar type. commit 816473a532d3fba4dde6aed9310b50051b6c7f64 Author: Rafael Dominguez Date: Thu Mar 15 22:20:03 2012 + Add chart errorbar type property. - Make StatisticsItemConverter work with X and Y errorbars. - Fill errorbar type property in ErrorBarResources. - Set default value of errorbar type property to Y bar. commit 3719518cb76e9b07d68f21ee7e4a0e7ec26c7bcc Author: Rafael Dominguez Date: Wed Mar 14 21:23:36 2012 + Add chart insert X errorbar toolbar and popup menu entries. - Dispatch the commands to the proper functions. commit 237e0a8276421f9ba489ecf6e2523be556a403cd Author: Rafael Dominguez Date: Wed Mar 14 20:25:36 2012 + Add correct tabpage to chart property dialog. - Added needed strings resources and ids. - Added code to handle X and Z errorbars. commit 0a436c2f71f180525bfa8918eded225429967ee0 Author: Rafael Dominguez Date: Wed Mar 14 18:40:44 2012 + Set chart objecttype depending on errorbar type. commit 016e4e031529d3cbe11374eb3f26dbb53ff6da86 Author: Rafael Dominguez Date: Sun Mar 11 19:52:55 2012 + Display correct errorbar in InsertDialog. commit f033474f8ab810bc556ae67b251d24ed7cff9b41 Author: Rafael Dominguez Date: Sun Mar 11 18:02:36 2012 + Make executeDispatch_InsertYErrorBars a generic function. - Make the function usable for XError and YError bars. - Rename executeDispatch_InsertYErrorBars to executeDispatch_InsertErrorBars. - Add a new parameter that control the
[Libreoffice-commits] .: sc/source
sc/source/ui/inc/ScDevChart.hxx | 87
1 file changed, 87 deletions(-)
New commits:
commit 4e43ad788b308a6ce8369b8e061cda6d5f7523de
Author: Rafael Dominguez
Date: Sun Mar 18 16:34:23 2012 +
Remove deprecated class DevChartConfigItem.
diff --git a/sc/source/ui/inc/ScDevChart.hxx b/sc/source/ui/inc/ScDevChart.hxx
deleted file mode 100644
index 5f60bce..000
--- a/sc/source/ui/inc/ScDevChart.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef INCLUDED_DEVCHARTCONFIG_HXX
-#define INCLUDED_DEVCHARTCONFIG_HXX
-
-#include
-
-namespace ScDevChart
-{
-
-class DevChartConfigItem : public ::utl::ConfigItem
-{
-public:
-DevChartConfigItem() :
-ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"Office.Common/Internal" )),
-CONFIG_MODE_IMMEDIATE_UPDATE )
-{}
-
-bool UseDevelopmentChart();
-};
-
-bool DevChartConfigItem::UseDevelopmentChart()
-{
-bool bResult = false;
-
-::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( 1 );
-aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"DevelopmentChart" ));
-
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aResult(
GetProperties( aNames ));
-
-OSL_ASSERT( aResult.getLength());
-aResult[0] >>= bResult;
-
-return bResult;
-}
-
-/** States whether the new chart implementation or the old one should be used.
-If is returned the newly developed chart (chart2) should be used.
-If is returned, the old chart (sch) should be used.
-
-Config-Item: Office.Common/Internal:DevelopmentChart
-
-This function (the complete header) is only for a transitional period. It
-will be deprecated after the new chart is definitely integrated into the
-product.
- */
-bool UseDevChart()
-{
-// static DevChartConfigItem aCfgItem;
-// return aCfgItem.UseDevelopmentChart();
-
-// ignore configuration
-//@todo: get rid of this class
-return true;
-}
-
-} // namespace ScDevChart
-
-// INCLUDED_DEVCHARTCONFIG_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
