[Libreoffice-commits] .: 4 commits - chart2/source
chart2/source/controller/dialogs/res_DataLabel.cxx |9 ++-
chart2/source/controller/main/ChartController_Properties.cxx |2
chart2/source/controller/main/DragMethod_RotateDiagram.cxx |3 -
chart2/source/inc/defines.hxx| 27 +++
chart2/source/tools/ThreeDHelper.cxx |4 -
chart2/source/view/axes/VCoordinateSystem.cxx|1
chart2/source/view/charttypes/PieChart.cxx | 10 +++-
chart2/source/view/charttypes/VSeriesPlotter.cxx |1
chart2/source/view/diagram/VDiagram.cxx |1
chart2/source/view/inc/ViewDefines.hxx |5 --
chart2/source/view/main/ChartView.cxx|1
chart2/source/view/main/PlottingPositionHelper.cxx |1
12 files changed, 51 insertions(+), 14 deletions(-)
New commits:
commit 6858182d246f21c5b06af09d8ff0e6fd04ef26c3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Sat Dec 8 00:00:49 2012 -0500
bnc#791952: Setting properties for all data labels.
You can set different properties to individual data labels. But setting
new properties to all data labels should overwrite the individual settings.
Change-Id: I934bad89326115aa83feb86275cf380d701a5686
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 9113d90..a651eb8 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -282,14 +282,15 @@ void DataLabelResources::EnableControls()
{
m_aCBSymbol.Enable( m_aCBNumber.IsChecked() || (m_aCBPercent.IsChecked()
m_aCBPercent.IsEnabled()) || m_aCBCategory.IsChecked() );
-//enable separator
+// Enable or disable separator, placement and direction based on the check
+// box states. Note that the check boxes are tri-state.
{
long nNumberOfCheckedLabelParts = 0;
-if( m_aCBNumber.IsChecked() )
+if (m_aCBNumber.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
-if( m_aCBPercent.IsChecked() m_aCBPercent.IsEnabled() )
+if (m_aCBPercent.GetState() != STATE_NOCHECK
m_aCBPercent.IsEnabled())
++nNumberOfCheckedLabelParts;
-if( m_aCBCategory.IsChecked() )
+if (m_aCBCategory.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
m_aSeparatorResources.Enable( nNumberOfCheckedLabelParts 1 );
bool bEnableTextDir = nNumberOfCheckedLabelParts 0;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index e0bf6ce..0f31720 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -231,7 +231,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pItemConverter = new wrapper::DataPointItemConverter(
xChartModel, xContext,
xObjectProperties, xSeries,
rDrawModel.GetItemPool(), rDrawModel,
uno::Reference
lang::XMultiServiceFactory ( xChartModel, uno::UNO_QUERY ),
-eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, false,
+eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, true,
nNumberFormat, nPercentNumberFormat );
break;
}
commit e6591c6e940cc694aa68c97e287e59572f690d74
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Dec 7 21:14:50 2012 -0500
bnc#791952: Use center label placement for Best fit in pie charts.
It works better this way for Excel interoperability. In Excel, Best fit
is slightly different than the center placement, but the two are pretty
close in pie charts.
Change-Id: I7f04a1babb04fd488d8cf90df247c294fa9d7b67
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index fff4e98..e8fc689 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -449,9 +449,15 @@ void PieChart::createShapes()
}
sal_Int32 nLabelPlacement = pSeries-getLabelPlacement(
nPointIndex, m_xChartTypeModel, m_nDimension, m_pPosHelper-isSwapXAndY() );
+
+// AVOID_OVERLAP is in fact Best fit in the UI.
bool bMovementAllowed = ( nLabelPlacement ==
::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP );
if( bMovementAllowed )
-nLabelPlacement =
::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
+// Use center for Best fit for now. In the
[Libreoffice-commits] .: 4 commits - chart2/source l10ntools/source sal/qa sal/test sal/workben testtools/source
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx |3
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx |8
chart2/source/controller/main/ChartController.cxx |2
l10ntools/source/help/HelpLinker.cxx |6
l10ntools/source/xmlparse.cxx | 114 +++--
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx| 122 --
sal/test/unloading/samplelib1.cxx | 48 +--
sal/test/unloading/samplelib2.cxx | 36 +-
sal/workben/t_osl_getVolInfo.cxx | 12
sal/workben/t_osl_joinProcess.cxx |6
testtools/source/bridgetest/multi.cxx | 42 +--
11 files changed, 181 insertions(+), 218 deletions(-)
New commits:
commit 35a30cbc04cee9b8cdffc334f631ce5580a89e03
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Jun 1 06:28:51 2012 -0500
targeted string re-work
Change-Id: I7b2dac4afc448b6b694bc48f162f46d2a5a7dddb
diff --git a/l10ntools/source/help/HelpLinker.cxx
b/l10ntools/source/help/HelpLinker.cxx
index 7656d0b..a95c56b 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -899,7 +899,7 @@ void HelpLinker::main( std::vectorstd::string args,
//This part is used when compileExtensionHelp is called from the
extensions manager.
//If extension help is compiled using helplinker in the build process
rtl::OUString aIdxCaptionPathFileURL( *pOfficeHelpPath );
-aIdxCaptionPathFileURL +=
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/idxcaption.xsl));
+aIdxCaptionPathFileURL += rtl::OUString(/idxcaption.xsl);
rtl::OString aOStr_IdxCaptionPathFileURL( rtl::OUStringToOString
( aIdxCaptionPathFileURL, fs::getThreadTextEncoding() ) );
@@ -924,7 +924,7 @@ void HelpLinker::main( std::vectorstd::string args,
//then -idxcontent must be supplied
//This part is used when compileExtensionHelp is called from the
extensions manager.
rtl::OUString aIdxContentPathFileURL( *pOfficeHelpPath );
-aIdxContentPathFileURL +=
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/idxcontent.xsl));
+aIdxContentPathFileURL += rtl::OUString(/idxcontent.xsl);
rtl::OString aOStr_IdxContentPathFileURL( rtl::OUStringToOString
( aIdxContentPathFileURL, fs::getThreadTextEncoding() ) );
@@ -1058,7 +1058,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
// i83624: Tree files
::rtl::OUString aTreeFileURL = aExtensionLanguageRoot;
-aTreeFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/help.tree));
+aTreeFileURL += rtl::OUString(/help.tree);
osl::DirectoryItem aTreeFileItem;
osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL,
aTreeFileItem );
osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index ad5197b..bcad104 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -720,7 +720,7 @@ OUString XMLElement::ToOUString(){
/*/
void XMLElement::Print(XMLNode *pCur, OUStringBuffer buffer , bool
rootelement ){
/*/
-static const OUString XML_LANG ( RTL_CONSTASCII_USTRINGPARAM(xml-lang) );
+static const OUString XML_LANG ( xml-lang );
if(pCur!=NULL){
if(rootelement){
@@ -742,34 +742,34 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer
buffer , bool rootelement
XMLElement *pElement = ( XMLElement * ) pCur;
if(
!pElement-GetName().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(comment))
){
-buffer.append(
OUString(RTL_CONSTASCII_USTRINGPARAM(\\)) );
+buffer.append( OUString(\\) );
buffer.append( pElement-GetName() );
if ( pElement-GetAttributeList()){
for ( size_t j = 0; j
pElement-GetAttributeList()-size(); j++ ){
OUString aAttrName(
(*pElement-GetAttributeList())[ j ]-GetName() );
if( !aAttrName.equalsIgnoreAsciiCase( XML_LANG ) )
{
-buffer.append(
OUString(RTL_CONSTASCII_USTRINGPARAM( )) );
+buffer.append( OUString( ) );
buffer.append( aAttrName );
-buffer.append(
OUString(RTL_CONSTASCII_USTRINGPARAM(=)) );
-buffer.append(
OUString(RTL_CONSTASCII_USTRINGPARAM(\\\)) );
+buffer.append( OUString(=) );
+buffer.append( OUString(\\\) );
[Libreoffice-commits] .: 4 commits - chart2/source cui/source fpicker/source sd/source sfx2/source svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source sw/source tools/inc unusedco
chart2/source/controller/main/UndoCommandDispatch.cxx |2
cui/source/dialogs/about.cxx |9 +-
cui/source/inc/about.hxx |2
fpicker/source/office/PlacesListBox.cxx |2
sd/source/ui/view/viewshe3.cxx|2
sfx2/source/appl/appquit.cxx |2
sfx2/source/appl/newhelp.cxx |2
sfx2/source/view/viewfrm.cxx |2
svtools/Library_svt.mk|2
svtools/Package_inc.mk|2
svtools/inc/svtools/itemdel.hxx |2
svtools/inc/svtools/svtdata.hxx | 70 -
svtools/inc/svtools/svtresid.hxx | 45 ++
svtools/inc/svtools/ttprops.hxx |2
svtools/source/brwbox/editbrowsebox.cxx |2
svtools/source/contnr/fileview.cxx|2
svtools/source/contnr/svimpbox.cxx|2
svtools/source/contnr/svtabbx.cxx |2
svtools/source/contnr/templwin.cxx|2
svtools/source/control/calendar.cxx |2
svtools/source/control/collatorres.cxx|2
svtools/source/control/ctrlbox.cxx|2
svtools/source/control/ctrltool.cxx |2
svtools/source/control/filectrl.cxx |2
svtools/source/control/indexentryres.cxx |2
svtools/source/control/tabbar.cxx |2
svtools/source/dialogs/addresstemplate.cxx|2
svtools/source/dialogs/filedlg2.cxx |2
svtools/source/dialogs/insdlg.cxx |2
svtools/source/dialogs/prnsetup.cxx |2
svtools/source/dialogs/roadmapwizard.cxx |2
svtools/source/dialogs/wizardmachine.cxx |2
svtools/source/java/javacontext.cxx |2
svtools/source/java/javainteractionhandler.cxx|2
svtools/source/misc/ehdl.cxx |2
svtools/source/misc/embedhlp.cxx |2
svtools/source/misc/imagemgr.cxx |2
svtools/source/misc/itemdel.cxx | 23 -
svtools/source/misc/langtab.cxx |2
svtools/source/misc/svtdata.cxx | 74 --
svtools/source/misc/svtresid.cxx | 60 ++
svtools/source/toolpanel/paneltabbar.cxx |2
svtools/source/toolpanel/toolpaneldrawer.cxx |2
sw/source/ui/docvw/HeaderFooterWin.cxx|2
sw/source/ui/uiview/srcview.cxx |2
sw/source/ui/wrtsh/wrtundo.cxx|2
tools/inc/tools/shl.hxx |2
unusedcode.easy |8 -
48 files changed, 157 insertions(+), 214 deletions(-)
New commits:
commit fd257f9e1936b0bc9bc9116bd73eaa04a7dbd060
Author: Caolán McNamara caol...@redhat.com
Date: Wed Apr 25 16:06:16 2012 +0100
Resolves: fdo#48659 force BUILDID placeholder in if missing from translation
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index dd39869..21473b7 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -78,7 +78,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) :
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE,
*rId.GetResMgr() ) ),
aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE,
*rId.GetResMgr() ) ),
aCancelButton( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr()
) ),
-aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())),
+aVersionTextStr(ResId::toString(ResId(ABOUT_STR_VERSION,
*rId.GetResMgr())).trim()),
m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
m_aBasedTextStr(ResId(ABOUT_STR_BASED, *rId.GetResMgr())),
@@ -372,9 +372,14 @@ rtl::OUString AboutDialog::GetVersionString()
rtl::OUString sBuildId = GetBuildId();
-if (!(sBuildId.trim()).isEmpty())
+if (!sBuildId.trim().isEmpty())
{
sVersion += ;
+if (m_sBuildStr.indexOf($BUILDID) == -1)
+{
+SAL_WARN( cui.dialogs, translated Build Id string in
translations doesn't contain $BUILDID placeholder );
+m_sBuildStr += $BUILDID;
+}
sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId);
}
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index a665215..a666c1a 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -57,7 +57,7 @@ private:
CancelButtonaCancelButton;
[Libreoffice-commits] .: 4 commits - chart2/source cui/source reportdesign/source sd/source svtools/inc svtools/source svx/inc svx/source
chart2/source/controller/dialogs/ChartTypeDialogController.cxx |1
chart2/source/controller/dialogs/ChartTypeDialogController.hxx |3
chart2/source/controller/inc/res_ErrorBar.hxx |1
cui/source/tabpages/numpages.cxx |1
reportdesign/source/ui/dlg/Condition.cxx |1
reportdesign/source/ui/dlg/Condition.hxx |2
sd/source/ui/animations/CustomAnimationCreateDialog.cxx|1
sd/source/ui/table/TableDesignPane.cxx |1
sd/source/ui/table/TableDesignPane.hxx |1
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx |1
svtools/inc/svtools/valueset.hxx |1
svtools/source/control/toolbarmenuimp.hxx |2
svtools/source/control/valueset.cxx| 218
--
svx/inc/svx/float3d.hxx|1
svx/source/gallery2/galbrws2.cxx |1
svx/source/tbxctrls/colorwindow.hxx|1
svx/source/tbxctrls/extrusioncontrols.hxx |2
17 files changed, 96 insertions(+), 143 deletions(-)
New commits:
commit d701d7b68344854b9a67583bbd38f40d061e6cb4
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Tue Apr 3 15:00:19 2012 +0200
ValueSet: reworked key navigation
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index e8aa9f5..95d5e6b 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1299,41 +1299,22 @@ void ValueSet::Tracking( const TrackingEvent rTEvt )
// ---
-namespace
-{
-
-size_t
-lcl_gotoLastLine(size_t const nLastPos, size_t const nCols, size_t const
nCurPos)
-{
-size_t nItemPos = nLastPos+1)/nCols)-1)*nCols)+(nCurPos%nCols);
-if ( nItemPos+nCols = nLastPos )
-nItemPos = nItemPos + nCols;
-return nItemPos;
-}
-
-}
-
void ValueSet::KeyInput( const KeyEvent rKEvt )
{
size_t nLastItem = mItemList.size();
-size_t nItemPos = VALUESET_ITEM_NOTFOUND;
-size_t nCurPos = VALUESET_ITEM_NONEITEM;
-size_t nCalcPos;
if ( !nLastItem || !ImplGetFirstItem() )
{
Control::KeyInput( rKEvt );
return;
}
-else
-nLastItem--;
-if ( mnSelItemId )
-nCurPos = GetItemPos( mnSelItemId );
-nCalcPos = nCurPos;
+--nLastItem;
+const size_t nCurPos = mnSelItemId ? GetItemPos( mnSelItemId )
+ : mpNoneItem ? VALUESET_ITEM_NONEITEM :
0;
+size_t nItemPos = VALUESET_ITEM_NOTFOUND;
+size_t nVStep = mnCols;
-//switch off selection mode if key travelling is used
-bool bDefault = false;
switch ( rKEvt.GetKeyCode().GetCode() )
{
case KEY_HOME:
@@ -1345,147 +1326,129 @@ void ValueSet::KeyInput( const KeyEvent rKEvt )
break;
case KEY_LEFT:
-case KEY_RIGHT:
-if ( rKEvt.GetKeyCode().GetCode()==KEY_LEFT )
+if (nCurPos != VALUESET_ITEM_NONEITEM)
{
-if ( nCalcPos == VALUESET_ITEM_NONEITEM )
-nItemPos = nLastItem;
-else if ( !nCalcPos )
+if (nCurPos)
{
-if ( mpNoneItem )
-nItemPos = VALUESET_ITEM_NONEITEM;
-else
-nItemPos = nLastItem;
+nItemPos = nCurPos-1;
+}
+else if (mpNoneItem)
+{
+nItemPos = VALUESET_ITEM_NONEITEM;
}
-else
-nItemPos = nCalcPos-1;
}
-else
+break;
+
+case KEY_RIGHT:
+if (nCurPos nLastItem)
{
-if ( nCalcPos == VALUESET_ITEM_NONEITEM )
-nItemPos = 0;
-else if ( nCalcPos == nLastItem )
+if (nCurPos == VALUESET_ITEM_NONEITEM)
{
-if ( mpNoneItem )
-nItemPos = VALUESET_ITEM_NONEITEM;
-else
-nItemPos = 0;
+nItemPos = 0;
}
else
-nItemPos = nCalcPos+1;
+{
+nItemPos = nCurPos+1;
+}
}
-nCalcPos = nItemPos;
break;
-case KEY_UP:
case KEY_PAGEUP:
-{
-if( rKEvt.GetKeyCode().GetCode() != KEY_PAGEUP ||
-( !rKEvt.GetKeyCode().IsShift()
!rKEvt.GetKeyCode().IsMod1() !rKEvt.GetKeyCode().IsMod2() ) )
+if (rKEvt.GetKeyCode().IsShift() || rKEvt.GetKeyCode().IsMod1() ||
[Libreoffice-commits] .: 4 commits - chart2/source sax/qa sax/source sc/source sd/source sfx2/source svl/source svtools/source sw/source tools/inc tools/source vcl/source xmloff/source
chart2/source/view/axes/DateHelper.cxx |6 -
sax/qa/cppunit/test_converter.cxx |9 +-
sax/source/tools/converter.cxx | 19 +++-
sc/source/core/tool/interpr2.cxx |2
sd/source/ui/annotations/annotationmanager.cxx |2
sfx2/source/doc/docfile.cxx|2
sfx2/source/doc/oleprops.cxx |2
svl/source/items/dateitem.cxx |2
svtools/source/contnr/templwin.cxx |2
svtools/source/control/calendar.cxx|8 -
sw/source/core/fields/docufld.cxx |2
sw/source/ui/docvw/SidebarWin.cxx |2
tools/inc/tools/date.hxx |6 +
tools/source/datetime/tdate.cxx| 111 +++--
tools/source/inet/inetmsg.cxx |2
vcl/source/control/field2.cxx |2
xmloff/source/core/xmluconv.cxx| 11 ++
17 files changed, 158 insertions(+), 32 deletions(-)
New commits:
commit 7613359985a89a42417a746bcdbb25f072784733
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 30 02:05:25 2011 +0100
handle dates with year 1000
* Read dates with years consisting of less than 4 digits.
ISO 8601 specifies that years are to be written with a minimum of 4
digits.
However, be lenient in what we accept.
* Write years 1000 with leading zeros to comply with ISO 8601 .
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 923c7eb..17d1303 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -215,8 +215,13 @@ void ConverterTest::testDateTime()
doTest( util::DateTime(0, 0, 0, 24, 1, 1, 333)
/*(0, 0, 0, 0, 2, 1, 333)*/,
0333-01-01T24:00:00/*, 0333-01-02T00:00:00*/ );
-doTestDateTimeF( +0001-01-01T00:00:00 ); // invalid: ^+
-doTestDateTimeF( 1-01-01T00:00:00 ); // invalid: 4 Y
+// A leading ^+ is NOT invalid, ISO 8601 specifies this for explicit AD/CE.
+doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
++0001-01-01T00:00:00, 0001-01-01T00:00:00 );
+// While ISO 8601 specifies a minimum of 4 year digits we are lenient in
+// what we accept.
+doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
+1-01-01T00:00:00, 0001-01-01T00:00:00 );
doTestDateTimeF( 0001-1-01T00:00:00 ); // invalid: 2 M
doTestDateTimeF( 0001-01-1T00:00:00 ); // invalid: 2 D
doTestDateTimeF( 0001-01-01T0:00:00 ); // invalid: 2 H
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index b1629c8..0c0779b 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1345,15 +1345,26 @@ bool Converter::convertDateOrDateTime(
const ::rtl::OUString string = rString.trim().toAsciiUpperCase();
sal_Int32 nPos(0);
-if ((string.getLength() nPos) (sal_Unicode('-') == string[nPos]))
+if (string.getLength() nPos)
{
-//Negative Number
-++nPos;
+if (sal_Unicode('-') == string[nPos])
+{
+//Negative Number
+++nPos;
+}
+else if (sal_Unicode('+') == string[nPos])
+{
+//Positive Number, explicit AD/CE
+++nPos;
+}
}
sal_Int32 nYear(0);
{
-bSuccess = readDateTimeComponent(string, nPos, nYear, 4, false);
+// While ISO 8601 specifies years with a minimum of 4 digits, be
+// leninent in what we accept for years 1000. One digit is acceptable
+// if the remainders match.
+bSuccess = readDateTimeComponent(string, nPos, nYear, 1, false);
bSuccess = (0 nYear);
bSuccess = (nPos string.getLength()); // not last token
}
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 5ea85f1..6ceb885 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -436,9 +436,16 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer
rBuffer,
aDate += 1;
}
}
-rBuffer.append( sal_Int32( aDate.GetYear()));
+sal_uInt16 nTemp = aDate.GetYear();
+if (nTemp 1000)
+rBuffer.append( sal_Unicode('0'));
+if (nTemp 100)
+rBuffer.append( sal_Unicode('0'));
+if (nTemp 10)
+rBuffer.append( sal_Unicode('0'));
+rBuffer.append( sal_Int32( nTemp));
rBuffer.append( sal_Unicode('-'));
-sal_uInt16 nTemp = aDate.GetMonth();
+nTemp = aDate.GetMonth();
if (nTemp 10)
rBuffer.append( sal_Unicode('0'));
rBuffer.append( sal_Int32( nTemp));
commit 07a7b2937a9427b2feb3307804ec0f527091bb92
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 30 02:05:24 2011 +0100
fixed fdo#40363 freeze chart wizard with non-gregorian date
Use the newly introduced Date::Normalize() instead of a never ending
while(!date.IsValid())
[Libreoffice-commits] .: 4 commits - chart2/source cui/source desktop/test solenv/bin solenv/gdb solenv/inc
chart2/source/view/main/ShapeFactory.cxx |1 cui/source/tabpages/tpline.cxx |4 desktop/test/deployment/boxt/Addons.xcu | 50 -- desktop/test/deployment/boxt/ProtocolHandler.xcu | 38 desktop/test/deployment/boxt/boxt.cxx| 184 --- desktop/test/deployment/boxt/description.xml | 39 desktop/test/deployment/boxt/makefile.mk | 68 desktop/test/deployment/boxt/manifest.xml| 37 solenv/bin/macosx-change-install-names.pl|4 solenv/gdb/makefile.mk |3 solenv/inc/settings.mk |1 solenv/inc/unxaigppc.mk |1 solenv/inc/unxgcc.mk |1 solenv/inc/unxmacx.mk|1 solenv/inc/unxsoli4.mk |1 solenv/inc/unxsols4.mk |1 solenv/inc/unxsolu4.mk |1 17 files changed, 4 insertions(+), 431 deletions(-) New commits: commit ae8102f1e38c4da840f8343bbbd628f1c660c132 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Sep 20 20:13:02 2011 +0200 Removed pPageView made unused by previous changeset 3e5edf6c. diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index b6825b9..ac170a2 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -898,7 +898,7 @@ void SvxLineTabPage::Reset( const SfxItemSet rAttrs ) pModel-InsertPage( pPage, 0 ); SdrView* pView = new SdrView( pModel, aVDev ); pView-hideMarkHandles(); -SdrPageView* pPageView = pView-ShowSdrPage(pPage); +pView-ShowSdrPage(pPage); SdrObject *pObj=NULL; long nSymTmp=nSymType; if(pSymbolList) @@ -1545,7 +1545,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) // 3D View SdrView* pView = new SdrView( pModel, aVDev ); pView-hideMarkHandles(); -SdrPageView* pPageView = pView-ShowSdrPage(pPage); +pView-ShowSdrPage(pPage); PopupMenu* pPopup = new PopupMenu; String aEmptyStr; commit 122b729a5a974179265b6d7a8c1c92199262b76a Author: Stephan Bergmann sberg...@redhat.com Date: Tue Sep 20 20:06:39 2011 +0200 Removed unused fMaxSize introduced by previous changeset 3e5edf6c. diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index dc06eba..c2626ca 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -1293,7 +1293,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D const double fWidthH = rSize.DirectionX/2.0; //fWidthH stands for Half Width const double fHeightH = rSize.DirectionY/2.0; //fHeightH stands for Half Height -double fMaxSize = fHeightH fWidthH ? fHeightH : fWidthH; //assumes non negative const sal_Int32 nQuarterCount = 35; // points inside a quadrant, used in case circle sal_Int32 nPointCount = 4; //all arrow symbols only need 4 points commit 5bc0a6cf4e5e17fce49dad2575a13435908f2223 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Sep 20 19:56:08 2011 +0200 Cleaned up solenv/gdb/makefile.mk diff --git a/solenv/gdb/makefile.mk b/solenv/gdb/makefile.mk index 4078428..9e4383d 100644 --- a/solenv/gdb/makefile.mk +++ b/solenv/gdb/makefile.mk @@ -26,12 +26,11 @@ # instead of those above. PRJ=.. -PRJNAME=gdb +PRJNAME=solenv TARGET=gdb .INCLUDE : settings.mk .INCLUDE : target.mk -.INCLUDE : versionlist.mk ALLTAR : $(MISC)/autoloaders.flag commit b1f4e8424b2cdb2d59da7c3cc0fb7799fcd28916 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Sep 20 19:20:11 2011 +0200 Removed unused BOXT feature. diff --git a/desktop/test/deployment/boxt/Addons.xcu b/desktop/test/deployment/boxt/Addons.xcu deleted file mode 100644 index 3df7e2d..000 --- a/desktop/test/deployment/boxt/Addons.xcu +++ /dev/null @@ -1,50 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -!--** -* -* 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
[Libreoffice] Suspicious warning fixes (was: [Libreoffice-commits] .: 4 commits - chart2/source cui/source desktop/test solenv/bin solenv/gdb solenv/inc)
Regina, The below two commits fix warnings from code changed through a recent commit by you, and in both cases I am a little unsure whether my fix is good (see inline below). On 09/20/2011 08:51 PM, Stephan Bergmann wrote: chart2/source/view/main/ShapeFactory.cxx |1 cui/source/tabpages/tpline.cxx |4 [...] New commits: commit ae8102f1e38c4da840f8343bbbd628f1c660c132 Author: Stephan Bergmannsberg...@redhat.com Date: Tue Sep 20 20:13:02 2011 +0200 Removed pPageView made unused by previous changeset 3e5edf6c. diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index b6825b9..ac170a2 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -898,7 +898,7 @@ void SvxLineTabPage::Reset( const SfxItemSet rAttrs ) pModel-InsertPage( pPage, 0 ); SdrView* pView = new SdrView( pModel,aVDev ); pView-hideMarkHandles(); -SdrPageView* pPageView = pView-ShowSdrPage(pPage); +pView-ShowSdrPage(pPage); SdrObject *pObj=NULL; long nSymTmp=nSymType; if(pSymbolList) @@ -1545,7 +1545,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) // 3D View SdrView* pView = new SdrView( pModel,aVDev ); pView-hideMarkHandles(); -SdrPageView* pPageView = pView-ShowSdrPage(pPage); +pView-ShowSdrPage(pPage); I assume those ShowSdrPage calls have side effects, so should indeed be left in, right? PopupMenu* pPopup = new PopupMenu; String aEmptyStr; commit 122b729a5a974179265b6d7a8c1c92199262b76a Author: Stephan Bergmannsberg...@redhat.com Date: Tue Sep 20 20:06:39 2011 +0200 Removed unused fMaxSize introduced by previous changeset 3e5edf6c. diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index dc06eba..c2626ca 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -1293,7 +1293,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D const double fWidthH = rSize.DirectionX/2.0; //fWidthH stands for Half Width const double fHeightH = rSize.DirectionY/2.0; //fHeightH stands for Half Height -double fMaxSize = fHeightH fWidthH ? fHeightH : fWidthH; //assumes non negative fMaxSize was freshly introduced but not used -- was it a mistake to add it, or is the mistake rather that the place that should use it is missing? const sal_Int32 nQuarterCount = 35; // points inside a quadrant, used in case circle sal_Int32 nPointCount = 4; //all arrow symbols only need 4 points -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
