buildbot success in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Success Build revision 1498538 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/675 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Failure Build revision 1484083 on branch openoffice/branches/ia2 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7ia2/builds/155 Build reason was: The Nightly scheduler named 'aoo-win7-ia2' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r868072 - /websites/production/openoffice/content/
Author: pescetti Date: Mon Jul 1 21:08:37 2013 New Revision: 868072 Log: Publishing svnmucc operation to openoffice site by pescetti Added: websites/production/openoffice/content/ - copied from r868071, websites/staging/openoffice/trunk/content/
svn commit: r868071 - in /websites/staging/openoffice/trunk/content: ./ source.html
Author: buildbot Date: Mon Jul 1 21:06:49 2013 New Revision: 868071 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/source.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 1 21:06:49 2013 @@ -1 +1 @@ -1498687 +1498688 Modified: websites/staging/openoffice/trunk/content/source.html == --- websites/staging/openoffice/trunk/content/source.html (original) +++ websites/staging/openoffice/trunk/content/source.html Mon Jul 1 21:06:49 2013 @@ -85,8 +85,7 @@ Project Management PMC http://blogs.apache.org/OOo/";>Project Blog -PMC FAQs - +PMC FAQs The Apache Software Foundation @@ -106,7 +105,7 @@ for more information on using subversion For further information see the http://www.apache.org/dev/version-control.html";>Apache Source Code Repository page. Getting the source code This will get you everything, including the language files: -svn co https://svn.apache.org/repos/asf/openoffice/trunk aoo +svn co https://svn.apache.org/repos/asf/openoffice/trunk aoo @@ -143,7 +142,6 @@ be intact. as service to the ecosystem by a volunteer. Please note that this code is LGPL-licenced and is not maintained by the Apache OpenOffice project. The legacy repository can be found https://bitbucket.org/mst/ooo340";>here. -And, developer areas (cws, etc.) from http://hg.services.openoffice.org/";>here.
svn commit: r1498688 - /openoffice/site/trunk/content/source.mdtext
Author: pescetti Date: Mon Jul 1 21:06:46 2013 New Revision: 1498688 URL: http://svn.apache.org/r1498688 Log: hg.services.openoffice.org won't be restored, see dev list. Modified: openoffice/site/trunk/content/source.mdtext Modified: openoffice/site/trunk/content/source.mdtext URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/source.mdtext?rev=1498688&r1=1498687&r2=1498688&view=diff == --- openoffice/site/trunk/content/source.mdtext (original) +++ openoffice/site/trunk/content/source.mdtext Mon Jul 1 21:06:46 2013 @@ -79,9 +79,6 @@ LGPL-licenced and is not maintained by t The legacy repository can be found [here][10]. -And, developer areas (cws, etc.) from [here][11]. - - [1]: http://subversion.apache.org [2]: http://svn.apache.org/viewvc/openoffice/trunk [3]: http://www.apache.org/dev/version-control.html @@ -92,4 +89,3 @@ And, developer areas (cws, etc.) from [h [8]: https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds#DevelopmentSnapshotBuilds-fullsets [9]: http://ci.apache.org/projects/openoffice [10]: https://bitbucket.org/mst/ooo340 -[11]: http://hg.services.openoffice.org/
svn commit: r868070 - in /websites/staging/openoffice/trunk/content: ./ translate.html
Author: buildbot Date: Mon Jul 1 21:06:13 2013 New Revision: 868070 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/translate.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 1 21:06:13 2013 @@ -1 +1 @@ -1497436 +1498687 Modified: websites/staging/openoffice/trunk/content/translate.html == --- websites/staging/openoffice/trunk/content/translate.html (original) +++ websites/staging/openoffice/trunk/content/translate.html Mon Jul 1 21:06:13 2013 @@ -85,8 +85,7 @@ Project Management PMC http://blogs.apache.org/OOo/";>Project Blog -PMC FAQs - +PMC FAQs The Apache Software Foundation @@ -113,7 +112,7 @@ the translations current, complete and a A list of translations available in the most recent release of Apache OpenOffice can be found http://www.openoffice.org/download/other.html";>here A larger list of languages, including ones that have incomplete -translations are listed https://translate.apache.org/projects/OOo_34/";>here. +translations are listed https://translate.apache.org/projects/aoo40/";>here. How to Help First, register your interest. We track a list of volunteers interested in helping with each language on our wiki https://cwiki.apache.org/confluence/display/OOOUSERS/Localization+Volunteers";>here.
svn commit: r1498687 - /openoffice/site/trunk/content/translate.mdtext
Author: pescetti Date: Mon Jul 1 21:06:08 2013 New Revision: 1498687 URL: http://svn.apache.org/r1498687 Log: Use the current Pootle URL, nobody works on OOo_34 any longer. Modified: openoffice/site/trunk/content/translate.mdtext Modified: openoffice/site/trunk/content/translate.mdtext URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/translate.mdtext?rev=1498687&r1=1498686&r2=1498687&view=diff == --- openoffice/site/trunk/content/translate.mdtext (original) +++ openoffice/site/trunk/content/translate.mdtext Mon Jul 1 21:06:08 2013 @@ -34,7 +34,7 @@ A list of translations available in the OpenOffice can be found [here](http://www.openoffice.org/download/other.html) A larger list of languages, including ones that have incomplete -translations are listed [here](https://translate.apache.org/projects/OOo_34/). +translations are listed [here](https://translate.apache.org/projects/aoo40/). ##How to Help
svn commit: r1498538 [1/2] - /openoffice/trunk/extras/l10n/source/pt/localize.sdf
Author: jsc Date: Mon Jul 1 16:03:43 2013 New Revision: 1498538 URL: http://svn.apache.org/r1498538 Log: #121816# update latest translation for Portuguese (pt) Modified: openoffice/trunk/extras/l10n/source/pt/localize.sdf
svn commit: r1498507 - /openoffice/trunk/main/sw/source/core/docnode/nodes.cxx
Author: af
Date: Mon Jul 1 15:10:21 2013
New Revision: 1498507
URL: http://svn.apache.org/r1498507
Log:
121479: Prevent crash when loading some RTF documents.
Modified:
openoffice/trunk/main/sw/source/core/docnode/nodes.cxx
Modified: openoffice/trunk/main/sw/source/core/docnode/nodes.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/nodes.cxx?rev=1498507&r1=1498506&r2=1498507&view=diff
==
--- openoffice/trunk/main/sw/source/core/docnode/nodes.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/nodes.cxx Mon Jul 1 15:10:21
2013
@@ -522,6 +522,30 @@ sal_Bool SwNodes::_MoveNodes( const SwNo
sal_uInt16 nSectNdCnt = 0;
sal_Bool bSaveNewFrms = bNewFrms;
+// Check that the range of nodes to move is valid.
+// This is a very specific test that only checks that table nodes
+// are completely covered by the range. Issue 121479 has a
+// document for which this test fails.
+SwNodeIndex aNodeIndex (aRg.aEnd);
+while (aNodeIndex > aRg.aStart)
+{
+SwNode* pNode = rNodes[aNodeIndex.GetIndex()];
+if (pNode->GetNodeType() != ND_ENDNODE)
+break;
+SwStartNode* pStartNode = pNode->pStartOfSection;
+if (pStartNode==NULL)
+break;
+if ( ! pStartNode->IsTableNode())
+break;
+aNodeIndex = *pStartNode;
+if (aNodeIndex < aRg.aStart.GetIndex())
+{
+return sal_False;
+}
+--aNodeIndex;
+}
+
+
// bis alles verschoben ist
while( aRg.aStart < aRg.aEnd )
switch( (pAktNode = &aRg.aEnd.GetNode())->GetNodeType() )
svn commit: r1498499 [1/2] - /openoffice/trunk/extras/l10n/source/es/localize.sdf
Author: jsc Date: Mon Jul 1 14:59:24 2013 New Revision: 1498499 URL: http://svn.apache.org/r1498499 Log: #122457# update latest translation for Spanish (es) Modified: openoffice/trunk/extras/l10n/source/es/localize.sdf
svn commit: r1498495 - /openoffice/trunk/extras/l10n/source/it/localize.sdf
Author: jsc Date: Mon Jul 1 14:55:54 2013 New Revision: 1498495 URL: http://svn.apache.org/r1498495 Log: #122588# update latest translation for Italian (it) Modified: openoffice/trunk/extras/l10n/source/it/localize.sdf Modified: openoffice/trunk/extras/l10n/source/it/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/trunk/extras/l10n/source/it/localize.sdf?rev=1498495&r1=1498494&r2=1498495&view=diff == --- openoffice/trunk/extras/l10n/source/it/localize.sdf (original) +++ openoffice/trunk/extras/l10n/source/it/localize.sdf Mon Jul 1 14:55:54 2013 @@ -2277,7 +2277,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:ModifyMenu Label 0 it ~Cambia 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:PreviewDisplayQualityMenu Label 0 it Modalità anteprima 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:SendMenu Label 0 it Invia 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:SlideShowMenu Label 0 it Presentazione 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:SlideShowMenu Label 0 it ~Presentazione 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:SnapLinesMenu Label 0 it Linee guida 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:TemplatesMenu Label 0 it Stili 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:WorkspaceMenu Label 0 it Area di lavoro 20130618 17:22:18 @@ -3520,7 +3520,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:AnchorMenu Label 0 it Ancoraggio 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:ArrangeMenu Label 0 it ~Disponi 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:ChangesMenu Label 0 it Modifiche 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:EditMenuLabel 0 it Modifica 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:EditMenuLabel 0 it ~Modifica 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:FieldMenu Label 0 it Comando di cam~po 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:FlipMenuLabel 0 it Ri~specchia 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\GenericCommands.xcu 0 value ..GenericCommands.UserInterface.Popups..uno:FontDialog Label 0 it Carattere... 20130618 17:22:18 @@ -3530,7 +3530,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffi
svn commit: r1498494 [1/2] - /openoffice/trunk/extras/l10n/source/sl/localize.sdf
Author: jsc Date: Mon Jul 1 14:55:15 2013 New Revision: 1498494 URL: http://svn.apache.org/r1498494 Log: #122386# update latest translation for Slovenian (sl) Modified: openoffice/trunk/extras/l10n/source/sl/localize.sdf
svn commit: r1498474 - in /openoffice/trunk/main: solenv/bin/modules/installer/epmfile.pm sysui/desktop/debian/control
Author: orw
Date: Mon Jul 1 14:23:10 2013
New Revision: 1498474
URL: http://svn.apache.org/r1498474
Log:
121968: further changes for the creation of debian packages in order to get
them installed when a former AOO resp. OOo version is installed.
Modified:
openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
openoffice/trunk/main/sysui/desktop/debian/control
Modified: openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1498474&r1=1498473&r2=1498474&view=diff
==
--- openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm Mon Jul 1
14:23:10 2013
@@ -538,23 +538,13 @@ sub create_epm_header
if ( $installer::globals::debian ) {
$onereplaces =~ s/_/-/g; } # Debian allows no underline in package name
$line = "%replaces" . " " . $onereplaces . "\n";
push(@epmheader, $line);
-
- # Force the openofficeorg packages to get
removed,
- # see
http://www.debian.org/doc/debian-policy/ch-relationships.html
- # 7.5.2 Replacing whole packages, forcing their
removal
-
- if ( $installer::globals::debian )
- {
- $line = "%incompat" . " " .
$onereplaces . "\n";
- push(@epmheader, $line);
- }
}
if ( $installer::globals::debian &&
$variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
{
$line = "%provides" . "
openoffice.org-unbundled\n";
push(@epmheader, $line);
- $line = "%incompat" . "
openoffice.org-bundled\n";
+ $line = "%replaces" . "
openoffice.org-bundled\n";
push(@epmheader, $line);
}
}
Modified: openoffice/trunk/main/sysui/desktop/debian/control
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/control?rev=1498474&r1=1498473&r2=1498474&view=diff
==
--- openoffice/trunk/main/sysui/desktop/debian/control (original)
+++ openoffice/trunk/main/sysui/desktop/debian/control Mon Jul 1 14:23:10 2013
@@ -2,5 +2,5 @@ Description: %productname desktop integr
Maintainer: Apache Software Foundation
Architecture: all
Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration,
openoffice.org-debian-menus, openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration,
openoffice.org-debian-menus
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus,
openoffice.org-bundled, openoffice.org-common
svn commit: r1498443 [1/2] - /openoffice/trunk/extras/l10n/source/sk/localize.sdf
Author: jsc Date: Mon Jul 1 13:36:31 2013 New Revision: 1498443 URL: http://svn.apache.org/r1498443 Log: #122355# update latest translation for Slovak (sk) Modified: openoffice/trunk/extras/l10n/source/sk/localize.sdf
svn commit: r1498442 [1/2] - /openoffice/trunk/extras/l10n/source/cs/localize.sdf
Author: jsc Date: Mon Jul 1 13:35:47 2013 New Revision: 1498442 URL: http://svn.apache.org/r1498442 Log: #122660# update latest translation for Czech (cs) Modified: openoffice/trunk/extras/l10n/source/cs/localize.sdf
svn commit: r1498436 - /openoffice/trunk/extras/l10n/source/fi/localize.sdf
Author: jsc Date: Mon Jul 1 13:33:48 2013 New Revision: 1498436 URL: http://svn.apache.org/r1498436 Log: #122568# update latest translation for Finnish (fi) Modified: openoffice/trunk/extras/l10n/source/fi/localize.sdf Modified: openoffice/trunk/extras/l10n/source/fi/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/trunk/extras/l10n/source/fi/localize.sdf?rev=1498436&r1=1498435&r2=1498436&view=diff == --- openoffice/trunk/extras/l10n/source/fi/localize.sdf (original) +++ openoffice/trunk/extras/l10n/source/fi/localize.sdf Mon Jul 1 13:33:48 2013 @@ -1796,7 +1796,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:AuditMenu Label 0 fi ~Jäljitys 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:CellContentsMenu Label 0 fi So~lun sisältö 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:ColumnMenu Label 0 fi ~Sarake 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:DataMenu Label 0 fi Tiedot 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:DataMenu Label 0 fi Tie~dot 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:DataPilotMenu Label 0 fi ~Tietojen ohjaus 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:DelBreakMenu Label 0 fi ~Poista pakotettu vaihto 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:DrawGraphicMenuLabel 0 fi Grafiik~ka 20130618 17:22:18 @@ -1810,7 +1810,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:NamesMenu Label 0 fi ~Nimet 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:PrintRangesMenuLabel 0 fi ~Tulostusalueet 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:ProtectMenuLabel 0 fi ~Suojaa asiakirja 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:RowMenuLabel 0 fi ~Rivejä20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:RowMenuLabel 0 fi ~Rivi 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:SendTo Label 0 fi Lä~hetä 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcCommands.xcu 0 value ..CalcCommands.UserInterface.Popups..uno:SheetMenu Label 0 fi ~Taulukko 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\CalcWindowState.xcu 0 value ..CalcWindowState.UIElements.States.private:resource/toolbar/graffilterbar UIName 0 fi Kuvien suodatin 20130618 17:22:18 @@ -2274,10 +2274,10 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Popups..uno:MasterLayoutsMenu Label
svn commit: r1498435 [1/2] - /openoffice/trunk/extras/l10n/source/gd/localize.sdf
Author: jsc Date: Mon Jul 1 13:30:15 2013 New Revision: 1498435 URL: http://svn.apache.org/r1498435 Log: #122631# update latest translation for Scottish Gaelic (gd) Modified: openoffice/trunk/extras/l10n/source/gd/localize.sdf
svn commit: r1498433 [1/2] - /openoffice/trunk/extras/l10n/source/zh-CN/localize.sdf
Author: jsc Date: Mon Jul 1 13:29:30 2013 New Revision: 1498433 URL: http://svn.apache.org/r1498433 Log: #122661# update latest translation for Chinese (zh_CN) Modified: openoffice/trunk/extras/l10n/source/zh-CN/localize.sdf
svn commit: r1498356 - in /openoffice/trunk/main/chart2/source: inc/InternalDataProvider.hxx tools/ChartModelHelper.cxx tools/InternalDataProvider.cxx
Author: alg
Date: Mon Jul 1 10:43:33 2013
New Revision: 1498356
URL: http://svn.apache.org/r1498356
Log:
i120559 Corrected load for charts without RangeString bu twith local
row-oriented data
Modified:
openoffice/trunk/main/chart2/source/inc/InternalDataProvider.hxx
openoffice/trunk/main/chart2/source/tools/ChartModelHelper.cxx
openoffice/trunk/main/chart2/source/tools/InternalDataProvider.cxx
Modified: openoffice/trunk/main/chart2/source/inc/InternalDataProvider.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/inc/InternalDataProvider.hxx?rev=1498356&r1=1498355&r2=1498356&view=diff
==
--- openoffice/trunk/main/chart2/source/inc/InternalDataProvider.hxx (original)
+++ openoffice/trunk/main/chart2/source/inc/InternalDataProvider.hxx Mon Jul 1
10:43:33 2013
@@ -75,8 +75,13 @@ class InternalDataProvider :
{
public:
explicit InternalDataProvider(const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & _xContext);
-explicit InternalDataProvider( const ::com::sun::star::uno::Reference<
-
::com::sun::star::chart2::XChartDocument > & xChartDoc, bool bConnectToModel );
+
+// #120559# allow handing over a default for data orientation
(DataInColumns) that will
+// be used when no data is available
+explicit InternalDataProvider(
+const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDoc,
+bool bConnectToModel,
+bool bDefaultDataInColumns );
explicit InternalDataProvider( const InternalDataProvider & rOther );
virtual ~InternalDataProvider();
Modified: openoffice/trunk/main/chart2/source/tools/ChartModelHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/tools/ChartModelHelper.cxx?rev=1498356&r1=1498355&r2=1498356&view=diff
==
--- openoffice/trunk/main/chart2/source/tools/ChartModelHelper.cxx (original)
+++ openoffice/trunk/main/chart2/source/tools/ChartModelHelper.cxx Mon Jul 1
10:43:33 2013
@@ -43,6 +43,9 @@
// header for define DBG_ASSERT
#include
+#include
+#include
+
//.
namespace chart
{
@@ -59,7 +62,35 @@ uno::Reference< chart2::data::XRangeHigh
uno::Reference< chart2::data::XDataProvider >
ChartModelHelper::createInternalDataProvider(
const uno::Reference< ::com::sun::star::chart2::XChartDocument >&
xChartDoc, bool bConnectToModel )
{
-return new InternalDataProvider( xChartDoc, bConnectToModel );
+bool bDefaultDataInColumns(true);
+
+// #120559# Try to access the current state of "DataRowSource" fo rthe
chart data and
+// use it as default for creating a new InternalDataProvider
+if(xChartDoc.is())
+{
+::com::sun::star::uno::Reference<
::com::sun::star::chart::XChartDocument > xDoc(xChartDoc, uno::UNO_QUERY);
+
+if(xDoc.is())
+{
+::com::sun::star::uno::Reference<
::com::sun::star::chart::XDiagram > aDiagram = xDoc->getDiagram();
+
+if(aDiagram.is())
+{
+::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xProp(aDiagram, uno::UNO_QUERY);
+
+if(xProp.is())
+{
+::com::sun::star::chart::ChartDataRowSource
aDataRowSource(::com::sun::star::chart::ChartDataRowSource_COLUMNS);
+
+xProp->getPropertyValue(
::rtl::OUString::createFromAscii("DataRowSource")) >>= aDataRowSource;
+
+bDefaultDataInColumns =
(::com::sun::star::chart::ChartDataRowSource_COLUMNS == aDataRowSource);
+}
+}
+}
+}
+
+return new InternalDataProvider( xChartDoc, bConnectToModel,
bDefaultDataInColumns );
}
uno::Reference< XDiagram > ChartModelHelper::findDiagram( const
uno::Reference< frame::XModel >& xModel )
Modified: openoffice/trunk/main/chart2/source/tools/InternalDataProvider.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/tools/InternalDataProvider.cxx?rev=1498356&r1=1498355&r2=1498356&view=diff
==
--- openoffice/trunk/main/chart2/source/tools/InternalDataProvider.cxx
(original)
+++ openoffice/trunk/main/chart2/source/tools/InternalDataProvider.cxx Mon Jul
1 10:43:33 2013
@@ -337,8 +337,11 @@ InternalDataProvider::InternalDataProvid
: m_bDataInColumns( true )
{}
-InternalDataProvider::InternalDataProvider( const Reference<
chart2::XChartDocument > & xChartDoc, bool bConnectToModel )
-: m_bDataInColumns( true )
+InternalDataProvider::InternalDataProvider(
+const Reference< chart2::XChartDocument > & xChartDoc,
+bool bConnectToModel,
+bool bDefaultDataInCol
buildbot success in ASF Buildbot on aoo-w7snap
Hi! , The aoo-w7snap builder has just completed a run STATUS: Success Build revision 1496831 on branch openoffice/tags/SNAPSHOT Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7snap/builds/62 Build reason was: The Nightly scheduler named 'aoo-win7-snapshot' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1498343 - /openoffice/trunk/main/sfx2/source/doc/docfile.cxx
Author: orw
Date: Mon Jul 1 09:54:24 2013
New Revision: 1498343
URL: http://svn.apache.org/r1498343
Log:
121143: SfxMedium - assure that name of internal used temporary file does not
clash with SfxMedium's name
Modified:
openoffice/trunk/main/sfx2/source/doc/docfile.cxx
Modified: openoffice/trunk/main/sfx2/source/doc/docfile.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/doc/docfile.cxx?rev=1498343&r1=1498342&r2=1498343&view=diff
==
--- openoffice/trunk/main/sfx2/source/doc/docfile.cxx (original)
+++ openoffice/trunk/main/sfx2/source/doc/docfile.cxx Mon Jul 1 09:54:24 2013
@@ -585,7 +585,9 @@ Reference < XContent > SfxMedium::GetCon
SvStream* SfxMedium::GetInStream()
{
if ( pInStream )
+{
return pInStream;
+}
if ( pImp->pTempFile )
{
@@ -601,13 +603,17 @@ SvStream* SfxMedium::GetInStream()
pInStream = NULL;
}
else
+{
return pInStream;
+}
}
GetMedium_Impl();
if ( GetError() )
+{
return NULL;
+}
return pInStream;
}
@@ -2330,14 +2336,20 @@ void SfxMedium::GetMedium_Impl()
//TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor
if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() )
+{
SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+}
if ( !GetError() )
{
if ( pImp->xStream.is() )
+{
pInStream = utl::UcbStreamHelper::CreateStream( pImp->xStream
);
+}
else if ( pImp->xInputStream.is() )
+{
pInStream = utl::UcbStreamHelper::CreateStream(
pImp->xInputStream );
+}
}
pImp->bDownloadDone = sal_True;
@@ -3447,15 +3459,23 @@ sal_Bool SfxMedium::SetWritableForUserOn
void SfxMedium::CreateTempFile( sal_Bool bReplace )
{
if ( pImp->pTempFile )
- {
+{
if ( !bReplace )
return;
DELETEZ( pImp->pTempFile );
- aName = String();
- }
+aName = String();
+}
-pImp->pTempFile = new ::utl::TempFile();
+do
+{
+pImp->pTempFile = new ::utl::TempFile();
+if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+{
+delete pImp->pTempFile;
+pImp->pTempFile = NULL;
+}
+} while ( pImp->pTempFile == NULL );
pImp->pTempFile->EnableKillingFile( sal_True );
aName = pImp->pTempFile->GetFileName();
::rtl::OUString aTmpURL = pImp->pTempFile->GetURL();
@@ -3551,9 +3571,20 @@ void SfxMedium::CreateTempFileNoCopy()
{
// this call always replaces the existing temporary file
if ( pImp->pTempFile )
+{
delete pImp->pTempFile;
+pImp->pTempFile = NULL;
+}
-pImp->pTempFile = new ::utl::TempFile();
+do
+{
+pImp->pTempFile = new ::utl::TempFile();
+if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+{
+delete pImp->pTempFile;
+pImp->pTempFile = NULL;
+}
+} while ( pImp->pTempFile == NULL );
pImp->pTempFile->EnableKillingFile( sal_True );
aName = pImp->pTempFile->GetFileName();
if ( !aName.Len() )
svn commit: r1498336 - /openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src
Author: af
Date: Mon Jul 1 09:18:36 2013
New Revision: 1498336
URL: http://svn.apache.org/r1498336
Log:
122658: Fixed typo in localized string.
Found by: jteera
Reported by: Andrea Pescetti
Modified:
openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src
Modified: openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src?rev=1498336&r1=1498335&r2=1498336&view=diff
==
--- openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src
(original)
+++ openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src Mon
Jul 1 09:18:36 2013
@@ -396,7 +396,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME
};
String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
{
-Text [ en-US ] = "The index could not be created. The size of the chosen
column is to big.";
+Text [ en-US ] = "The index could not be created. The size of the chosen
column is too big.";
};
String STR_SQL_NAME_ERROR
svn commit: r1498335 - /openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
Author: jsc Date: Mon Jul 1 09:15:37 2013 New Revision: 1498335 URL: http://svn.apache.org/r1498335 Log: #122619# mark Impress.xcu anmd PresenterScreen.xcu as localized Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk?rev=1498335&r1=1498334&r2=1498335&view=diff == --- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk (original) +++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/makefile.mk Mon Jul 1 09:15:37 2013 @@ -109,7 +109,9 @@ LOCALIZEDFILES= \ Embedding.xcu \ WebWizard.xcu \ FormWizard.xcu \ -Writer.xcu +Writer.xcu \ +Impress.xcu \ + PresenterScreen.xcu .INCLUDE : target.mk
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1498212 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/654 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
