svn commit: r1453186 - in /openoffice/branches/l10n/main/l10ntools/source: gCon.cxx gCon.hxx gConDB.cxx gConPoWrap.cxx gHandler.cxx gL10nMem.cxx gL10nMem.hxx gL10nMemDB.cxx gLang.hxx makefile.mk
Author: jani
Date: Wed Mar 6 07:58:01 2013
New Revision: 1453186
URL: http://svn.apache.org/r1453186
Log:
new translation mem structure, to speed up load time
Added:
openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx (with props)
Modified:
openoffice/branches/l10n/main/l10ntools/source/gCon.cxx
openoffice/branches/l10n/main/l10ntools/source/gCon.hxx
openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx
openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx
openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx
openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx
openoffice/branches/l10n/main/l10ntools/source/gLang.hxx
openoffice/branches/l10n/main/l10ntools/source/makefile.mk
Modified: openoffice/branches/l10n/main/l10ntools/source/gCon.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gCon.cxx?rev=1453186&r1=1453185&r2=1453186&view=diff
==
--- openoffice/branches/l10n/main/l10ntools/source/gCon.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gCon.cxx Wed Mar 6 07:58:01
2013
@@ -90,15 +90,18 @@ convert_gen::~convert_gen()
/** I M P L E M E N T A T I O N **/
-void convert_gen::execute(const bool bMerge)
+bool convert_gen::execute(const bool bMerge, const bool bAllowNoFile)
{
convert_gen_impl::mcImpl->mbMergeMode = bMerge;
// and load file
- convert_gen_impl::mcImpl->prepareFile();
+ if (!convert_gen_impl::mcImpl->prepareFile(bAllowNoFile))
+return false;
// and execute conversion
convert_gen_impl::mcImpl->execute();
+
+ return true;
}
@@ -121,13 +124,18 @@ convert_gen_impl::~convert_gen_impl()
/** I M P L E M E N T A T I O N **/
-void convert_gen_impl::prepareFile()
+bool convert_gen_impl::prepareFile(bool bAllowNoFile)
{
std::ifstream inputFile(msSourceFile.c_str(), std::ios::binary);
if (!inputFile.is_open())
-throw showError((char *)"Cannot open file");
+ {
+if (bAllowNoFile)
+ return false;
+else
+ throw mcMemory.showError("Cannot open file");
+ }
// get length of file:
miSourceReadIndex = 0;
@@ -138,8 +146,9 @@ void convert_gen_impl::prepareFile()
// get size, prepare std::string and read whole file
inputFile.read((char *)msSourceBuffer.c_str(), msSourceBuffer.size());
if ((unsigned int)inputFile.gcount() != msSourceBuffer.size())
-throw showError((char *)"cannot read whole file");
+throw mcMemory.showError("cannot read whole file");
inputFile.close();
+ return true;
}
@@ -218,11 +227,3 @@ std::string& convert_gen_impl::copySourc
return msCopyText;
}
-
-
-
-/** I M P L E M E N T A T I O N **/
-std::string convert_gen_impl::showError(char *sText)
-{
- return mcMemory.showError(miLineNo, sText);
-}
\ No newline at end of file
Modified: openoffice/branches/l10n/main/l10ntools/source/gCon.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gCon.hxx?rev=1453186&r1=1453185&r2=1453186&view=diff
==
--- openoffice/branches/l10n/main/l10ntools/source/gCon.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gCon.hxx Wed Mar 6 07:58:01
2013
@@ -61,14 +61,13 @@ class convert_gen_impl
// utility functions for converters
void lexRead (char *sBuf, int *nResult, int nMax_size);
void writeSourceFile(const std::string& line);
-std::string showError(char *sText);
std::string& copySource(char *yyText, bool bDoClear = true);
protected:
std::string msSourceBuffer, msCopyText;
int miSourceReadIndex;
-void prepareFile();
+bool prepareFile(bool bAllowNoFile);
friend class convert_gen;
Modified: openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx?rev=1453186&r1=1453185&r2=1453186&view=diff
==
--- openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx Wed Mar 6
07:58:01 2013
@@ -45,22 +45,23 @@ void convert_db::execute()
msSourceBuffer += '\n';
miSize= msSourceBuffer.size() -1;
+ miLineNo = 0;
while (collectLine())
{
-mcMemory.setFileName(msFields[0]);
+mcMemory.setFileName(msFields[1]);
if (mbMergeMode)
{
iB = msFields[15].find("/");
if (iB == (int)std::string::npos)
-showError("missing / in en_US");
+showError((char*)"missing / in en_US");
iE = msFields[15].find(
buildbot success in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Success Build revision 1452762 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/526 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 openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Failure Build revision 1453158 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/536 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
[CONF] Apache OpenOffice Community > AOO 4.0 IAccessible2
Space: Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Page: AOO 4.0 IAccessible2 (https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+IAccessible2) Edited by Steve Yin: - The wiki is for tracing the IAccessible2 feature development effort in AOO 4.0. We are going to consolidate the background and development/testing status and related action items in this wiki. The goal of the IAccessible2 feature is to enhance accessibility on Microsoft Windows. h2. IAccessible2 Background You can get the brief information [here|http://wiki.openoffice.org/wiki/Accessibility/IAccessible2_support]. h2. Development Plan Following are development plan items: || Items \\ || Category \\ || Owner \\ || Status \\ || Comment \\ || | The UAA to IA2 bridge which is the fundamental part for the AOO IA2 implementation on Windows. \\ | DEV \\ | Steve Yin \\ | Finished \\ | Touch \~150 files \\ Target Date: 14/12/2012 | | Screen reader can access AOO UI by MSAA/IA2. | DEV \\ | Steve Yin \\ | Finished \\ Ready for QA | Touch \~200 files \\ Target Date: 2/2/2013 \\ *Delivery:* The UI content such as menus and dialogs can be read out by JAWS or other MSAA compatible AT tools | | Enable IA2 for all the objects, text and content in the documents of AOO. | DEV | Steve Yin | Ongoing \\ 15% | Touch \~650 files \\ Target Date: 30/6/2013 \\ *Delivery:* All content of the applications can be read out by JAWS or other IA2 compatible AT tools | Tips for building branch ia2 [here|https://cwiki.apache.org/confluence/display/OOOUSERS/Tips+for+branch+ia2] Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
buildbot failure in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Failure Build revision 1448553 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/32 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: r853159 - in /websites/production/ooo-site: cgi-bin/ content/
Author: rgb-es Date: Tue Mar 5 21:42:28 2013 New Revision: 853159 Log: Publishing svnmucc operation to ooo-site site by rgb-es Added: websites/production/ooo-site/cgi-bin/ - copied from r853158, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r853158, websites/staging/ooo-site/trunk/content/
svn commit: r853158 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/es/index.html
Author: buildbot Date: Tue Mar 5 21:41:32 2013 New Revision: 853158 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/es/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Mar 5 21:41:32 2013 @@ -1 +1 @@ -1452578 +1453023 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Mar 5 21:41:32 2013 @@ -1 +1 @@ -1452578 +1453023 Modified: websites/staging/ooo-site/trunk/content/es/index.html == --- websites/staging/ooo-site/trunk/content/es/index.html (original) +++ websites/staging/ooo-site/trunk/content/es/index.html Tue Mar 5 21:41:32 2013 @@ -128,8 +128,8 @@ y Esencial para empresas de 2012 - Más de 30 millones de descargas de AOO 3.4 - Apache OpenOffice 3.4 fue liberado en mayo: desde entonces las descargas han ya superado los treinta millones. + Más de 40 millones de descargas de AOO 3.4 + Apache OpenOffice 3.4 fue liberado en mayo 2012: desde entonces las descargas han ya superado los cuarenta millones. Puede consultar http://www.openoffice.org/stats/downloads.html";>nuestros gráficos con las estadísticas diarias de descargas.
svn commit: r1453023 - /openoffice/ooo-site/trunk/content/es/index.html
Author: rgb-es Date: Tue Mar 5 21:40:25 2013 New Revision: 1453023 URL: http://svn.apache.org/r1453023 Log: CMS commit to ooo-site by rgb-es Modified: openoffice/ooo-site/trunk/content/es/index.html Modified: openoffice/ooo-site/trunk/content/es/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/es/index.html?rev=1453023&r1=1453022&r2=1453023&view=diff == --- openoffice/ooo-site/trunk/content/es/index.html (original) +++ openoffice/ooo-site/trunk/content/es/index.html Tue Mar 5 21:40:25 2013 @@ -113,8 +113,8 @@ y Esencial para empresas de 2012 - Más de 30 millones de descargas de AOO 3.4 - Apache OpenOffice 3.4 fue liberado en mayo: desde entonces las descargas han ya superado los treinta millones. + Más de 40 millones de descargas de AOO 3.4 + Apache OpenOffice 3.4 fue liberado en mayo 2012: desde entonces las descargas han ya superado los cuarenta millones. Puede consultar http://www.openoffice.org/stats/downloads.html";>nuestros gráficos con las estadísticas diarias de descargas.
buildbot failure in ASF Buildbot on aoo-w7snap
Hi! , The aoo-w7snap builder has just completed a run STATUS: Failure Build revision 1452795 on branch None 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/34 Build reason was: forced: by IRC user on channel #asftest: sidebar build on snapshot bbot Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1452795 - /openoffice/tags/SNAPSHOT/
Author: af Date: Tue Mar 5 14:00:01 2013 New Revision: 1452795 URL: http://svn.apache.org/r1452795 Log: Moving to branch sidebar Added: openoffice/tags/SNAPSHOT/ (props changed) - copied from r1452760, openoffice/branches/sidebar/ Propchange: openoffice/tags/SNAPSHOT/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Mar 5 14:00:01 2013 @@ -0,0 +1,4 @@ +/incubator/ooo/branches/AOO34:1346776-1346777,1347535,1348052,1350569,1352456,1369110,1371068 +/incubator/ooo/branches/alg/linecap:1226811-1232461 +/incubator/ooo/branches/alg/svgreplacement:1205420-1220782 +/incubator/ooo/branches/writer001:1356067-1386577
svn commit: r1452762 - in /openoffice/trunk/main/l10ntools/inc: export.hxx l10ntools/directory.hxx l10ntools/file.hxx srciter.hxx
Author: hdu
Date: Tue Mar 5 12:22:40 2013
New Revision: 1452762
URL: http://svn.apache.org/r1452762
Log:
consolidate bytestring helper functors in l10ntools
also replace the "inverted" header guards by their canonical
counterparts to make that possible
Modified:
openoffice/trunk/main/l10ntools/inc/export.hxx
openoffice/trunk/main/l10ntools/inc/l10ntools/directory.hxx
openoffice/trunk/main/l10ntools/inc/l10ntools/file.hxx
openoffice/trunk/main/l10ntools/inc/srciter.hxx
Modified: openoffice/trunk/main/l10ntools/inc/export.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/l10ntools/inc/export.hxx?rev=1452762&r1=1452761&r2=1452762&view=diff
==
--- openoffice/trunk/main/l10ntools/inc/export.hxx (original)
+++ openoffice/trunk/main/l10ntools/inc/export.hxx Tue Mar 5 12:22:40 2013
@@ -24,11 +24,9 @@
#ifndef _EXPORT_HXX
#define _EXPORT_HXX
-#ifndef L10NTOOLS_DIRECTORY_HXX
-#define L10NTOOLS_DIRECTORY_HXX
#include
-#endif
+#include
// #define MERGE_SOURCE_LANGUAGES <- To merge en-US and de resource
@@ -55,31 +53,6 @@
#define JAPANESE_ISO "ja"
-
-struct eqstr{
- sal_Bool operator()(const char* s1, const char* s2) const{
-return strcmp(s1,s2)==0;
- }
-};
-
-struct equalByteString{
-bool operator()( const ByteString& rKey1, const ByteString& rKey2 )
const {
-return rKey1.CompareTo( rKey2 )==COMPARE_EQUAL;
-}
-};
-struct lessByteString{
-bool operator()( const ByteString& rKey1, const ByteString& rKey2 )
const {
-return rKey1.CompareTo( rKey2 )==COMPARE_LESS;
-}
-};
-
-struct hashByteString{
-size_t operator()( const ByteString& rName ) const{
-std::hash< const char* > myHash;
-return myHash( rName.GetBuffer() );
-}
-};
-
class PFormEntrys;
class MergeData;
typedef std::set ByteStringSet;
Modified: openoffice/trunk/main/l10ntools/inc/l10ntools/directory.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/l10ntools/inc/l10ntools/directory.hxx?rev=1452762&r1=1452761&r2=1452762&view=diff
==
--- openoffice/trunk/main/l10ntools/inc/l10ntools/directory.hxx (original)
+++ openoffice/trunk/main/l10ntools/inc/l10ntools/directory.hxx Tue Mar 5
12:22:40 2013
@@ -19,6 +19,9 @@
*
*/
+#ifndef L10NTOOLS_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
+
#include
#include
#include
@@ -33,10 +36,7 @@
#include
-#ifndef L10NTOOLS_FILE_HXX
-#define L10NTOOLS_FILE_HXX
#include
-#endif
namespace transex{
@@ -73,3 +73,6 @@ class Directory
};
}
+
+#endif // L10NTOOLS_DIRECTORY_HXX
+
Modified: openoffice/trunk/main/l10ntools/inc/l10ntools/file.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/l10ntools/inc/l10ntools/file.hxx?rev=1452762&r1=1452761&r2=1452762&view=diff
==
--- openoffice/trunk/main/l10ntools/inc/l10ntools/file.hxx (original)
+++ openoffice/trunk/main/l10ntools/inc/l10ntools/file.hxx Tue Mar 5 12:22:40
2013
@@ -19,6 +19,9 @@
*
*/
+#ifndef L10NTOOLS_FILE_HXX
+#define L10NTOOLS_FILE_HXX
+
#include "rtl/ustring.hxx"
namespace transex
@@ -42,3 +45,6 @@ class File
};
}
+
+#endif // L10NTOOLS_FILE_HXX
+
Modified: openoffice/trunk/main/l10ntools/inc/srciter.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/l10ntools/inc/srciter.hxx?rev=1452762&r1=1452761&r2=1452762&view=diff
==
--- openoffice/trunk/main/l10ntools/inc/srciter.hxx (original)
+++ openoffice/trunk/main/l10ntools/inc/srciter.hxx Tue Mar 5 12:22:40 2013
@@ -20,14 +20,12 @@
*/
+#ifndef L10NTOOLS_SRCITER_HXX
+#define L10NTOOLS_SRCITER_HXX
-#ifndef L10NTOOLS_DIRECTORY_HXX
-#define L10NTOOLS_DIRECTORY_HXX
#include
-#endif
// class SourceTreeIterator
-//
class SourceTreeIterator
{
@@ -51,4 +49,5 @@ public:
virtual void OnExecuteDirectory( const rtl::OUString &rDirectory );
};
+#endif // L10NTOOLS_SRCITER_HXX
svn commit: r1452760 [4/5] - in /openoffice/branches/sidebar/main: default_images/sfx2/res/symphony/ officecfg/registry/data/org/openoffice/Office/UI/ sd/source/ui/sidebar/ sfx2/inc/sfx2/sidebar/ sfx2
Added:
openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStylePopup.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStylePopup.hxx?rev=1452760&view=auto
==
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStylePopup.hxx
(added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStylePopup.hxx
Tue Mar 5 12:17:09 2013
@@ -0,0 +1,55 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#ifndef _SVX_SIDEBAR_LINE_STYLE_POPUP_HXX_
+#define _SVX_SIDEBAR_LINE_STYLE_POPUP_HXX_
+
+#include "svx/sidebar/Popup.hxx"
+
+#include
+
+class XLineStyleItem;
+class XLineDashItem;
+
+namespace svx { namespace sidebar {
+
+class LineStylePopup
+: public Popup
+{
+public :
+LineStylePopup (
+Window* pParent,
+const ::boost::function&
rControlCreator);
+virtual ~LineStylePopup (void);
+
+void SetStyleSelect (
+XLineStyleItem* pStyleItem,
+XLineDashItem* pDashItem,
+const bool bIsStyleItemAvailable,
+const bool bIsDashItemAvailable);
+
+protected:
+virtual void CreateContainerAndControl (void);
+};
+
+} } // end of namespace svx::sidebar
+
+#endif
Added:
openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.cxx?rev=1452760&view=auto
==
---
openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.cxx
(added)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/line/LineStyleValueSet.cxx
Tue Mar 5 12:17:09 2013
@@ -0,0 +1,132 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "LineStyleValueSet.hxx"
+
+#include
+
+
+namespace svx { namespace sidebar {
+
+LineStyleValueSet::LineStyleValueSet (
+Window* pParent,
+const ResId& rResId)
+: ValueSet( pParent, rResId ),
+ pVDev(NULL),
+ mbSelectFirst(true)
+{
+ SetColCount( 1 );
+}
+
+
+
+
+LineStyleValueSet::~LineStyleValueSet (void)
+{
+ delete pVDev;
+}
+
+
+
+
+void LineStyleValueSet::SetFirstString(XubString str)
+{
+ strNone = str;
+}
+
+
+
+
+void LineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
+{
+ Rectangle aRect = rUDEvt.GetRect();
+ OutputDevice* pDev = rUDEvt.GetDevice();
+ sal_uInt16 nItemId = rUDEvt.GetItemId();
+
+ long nRectHeight = aRect.GetHeight();
+ long nRectWidth = aRect.GetWidth();
+ Point aBLPos = aRect.TopLeft();
+ if(nItemId == 1)
+ {
+ const StyleSettings& rStyleSettings =
GetSettings().GetStyleSettings();
+ Color aOldFillColor = pDev->GetFillColor();
+ const Color aTextColor = rStyleSettings.GetFieldTextColor();
+
+ //draw back
+ if( mbSelectFirst )
+ {
+ Color aBackColor(50,107,197);
+ Rectangle aBackRect = aR
svn commit: r1452738 - /openoffice/trunk/main/configure.in
Author: paveljanik Date: Tue Mar 5 11:07:11 2013 New Revision: 1452738 URL: http://svn.apache.org/r1452738 Log: Presenter Console -> Presenter Screen. Modified: openoffice/trunk/main/configure.in Modified: openoffice/trunk/main/configure.in URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1452738&r1=1452737&r2=1452738&view=diff == --- openoffice/trunk/main/configure.in (original) +++ openoffice/trunk/main/configure.in Tue Mar 5 11:07:11 2013 @@ -522,8 +522,8 @@ AC_ARG_WITH(beanshell-jar, AC_ARG_ENABLE(minimizer, [ --enable-minimizer enables the build of the Presentation Minimizer extension ],,) -AC_ARG_ENABLE(presenter-console, -[ --enable-presenter-console enables the build of the Presenter Console extension +AC_ARG_ENABLE(presenter-screen, +[ --enable-presenter-screen enables the build of the Presenter Screen extension ],,) AC_ARG_ENABLE(pdfimport, [ --enable-pdfimport enables the build of the PDF Import extension @@ -6424,7 +6424,7 @@ fi AC_SUBST(ENABLE_MINIMIZER) AC_MSG_CHECKING([whether to build the Presenter Screen extension]) -if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then +if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then AC_MSG_RESULT([yes]) ENABLE_PRESENTER_SCREEN=YES else
svn commit: r1452736 - /openoffice/trunk/main/sc/source/core/inc/interpre.hxx
Author: paveljanik Date: Tue Mar 5 11:04:51 2013 New Revision: 1452736 URL: http://svn.apache.org/r1452736 Log: Define BOOST_MATH_OVERFLOW_ERROR_POLICY only in case it is not yet defined. Modified: openoffice/trunk/main/sc/source/core/inc/interpre.hxx Modified: openoffice/trunk/main/sc/source/core/inc/interpre.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/inc/interpre.hxx?rev=1452736&r1=1452735&r2=1452736&view=diff == --- openoffice/trunk/main/sc/source/core/inc/interpre.hxx (original) +++ openoffice/trunk/main/sc/source/core/inc/interpre.hxx Tue Mar 5 11:04:51 2013 @@ -44,7 +44,9 @@ // This header must be included before including any Boost // math function. // +#ifndef BOOST_MATH_OVERFLOW_ERROR_POLICY #define BOOST_MATH_OVERFLOW_ERROR_POLICY errno_on_error +#endif class ScDocument; class SbxVariable;
svn commit: r1452727 - in /openoffice/trunk/main: bridges/source/cpp_uno/msvc_win32_intel/except.cxx sw/source/core/text/portxt.hxx
Author: hdu Date: Tue Mar 5 10:37:22 2013 New Revision: 1452727 URL: http://svn.apache.org/r1452727 Log: the header file new.h is obsolete on our platforms Modified: openoffice/trunk/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx openoffice/trunk/main/sw/source/core/text/portxt.hxx Modified: openoffice/trunk/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx?rev=1452727&r1=1452726&r2=1452727&view=diff == --- openoffice/trunk/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx (original) +++ openoffice/trunk/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx Tue Mar 5 10:37:22 2013 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include Modified: openoffice/trunk/main/sw/source/core/text/portxt.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/portxt.hxx?rev=1452727&r1=1452726&r2=1452727&view=diff == --- openoffice/trunk/main/sw/source/core/text/portxt.hxx (original) +++ openoffice/trunk/main/sw/source/core/text/portxt.hxx Tue Mar 5 10:37:22 2013 @@ -22,11 +22,7 @@ #ifndef _PORTXT_HXX #define _PORTXT_HXX -#ifdef GCC -#include -#else -#include//fuer size_t, FIXEDMEM aus tools -#endif + #include #include "porlin.hxx"
svn commit: r1452716 - /openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
Author: hdu
Date: Tue Mar 5 10:16:43 2013
New Revision: 1452716
URL: http://svn.apache.org/r1452716
Log:
fix miscarried bitwise-or in WW8FormulaCheckBox's lcl_AddToPropertyContainer()
helper
Modified:
openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx?rev=1452716&r1=1452715&r2=1452716&view=diff
==
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx Tue Mar 5 10:16:43
2013
@@ -2586,7 +2586,7 @@ static void lcl_AddToPropertyContainer
uno::Any aAny(C2U(""));
xPropContainer->addProperty
(rPropertyName,
- static_cast(beans::PropertyAttribute::BOUND ||
+ static_cast(beans::PropertyAttribute::BOUND |
beans::PropertyAttribute::REMOVABLE),
aAny);
}
svn commit: r1452713 - /openoffice/trunk/main/svx/source/dialog/hdft.cxx
Author: hdu
Date: Tue Mar 5 09:57:11 2013
New Revision: 1452713
URL: http://svn.apache.org/r1452713
Log:
fix miscarried bitwise check in SvxHFPage::Reset()
Modified:
openoffice/trunk/main/svx/source/dialog/hdft.cxx
Modified: openoffice/trunk/main/svx/source/dialog/hdft.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/hdft.cxx?rev=1452713&r1=1452712&r2=1452713&view=diff
==
--- openoffice/trunk/main/svx/source/dialog/hdft.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/hdft.cxx Tue Mar 5 09:57:11 2013
@@ -406,7 +406,7 @@ void SvxHFPage::Reset( const SfxItemSet&
0 != (pItem =
pShell->GetItem(SID_HTML_MODE
{
nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue();
- if(nHtmlMode && HTMLMODE_ON)
+ if(nHtmlMode & HTMLMODE_ON)
{
aCntSharedBox.Hide();
aBackgroundBtn.Hide();
svn commit: r1452712 - /openoffice/trunk/main/editeng/source/outliner/outleeng.cxx
Author: hdu
Date: Tue Mar 5 09:51:35 2013
New Revision: 1452712
URL: http://svn.apache.org/r1452712
Log:
fix miscarried bitwise check in OutlinerEditEng::PaintingFirstLine()
Modified:
openoffice/trunk/main/editeng/source/outliner/outleeng.cxx
Modified: openoffice/trunk/main/editeng/source/outliner/outleeng.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/outliner/outleeng.cxx?rev=1452712&r1=1452711&r2=1452712&view=diff
==
--- openoffice/trunk/main/editeng/source/outliner/outleeng.cxx (original)
+++ openoffice/trunk/main/editeng/source/outliner/outleeng.cxx Tue Mar 5
09:51:35 2013
@@ -53,7 +53,7 @@ OutlinerEditEng::~OutlinerEditEng()
void OutlinerEditEng::PaintingFirstLine( sal_uInt16 nPara, const Point&
rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation,
OutputDevice* pOutDev )
{
- if( GetControlWord() && EE_CNTRL_OUTLINER )
+ if( GetControlWord() & EE_CNTRL_OUTLINER )
{
PaintFirstLineInfo aInfo( nPara, rStartPos, nBaseLineY,
rOrigin, nOrientation, pOutDev );
pOwner->maPaintFirstLineHdl.Call( &aInfo );
buildbot success in ASF Buildbot on openoffice-linux32-nightly
Hi! , The openoffice-linux32-nightly builder has just completed a run STATUS: Success Build revision 1452658 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm2_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/422 Build reason was: The Nightly scheduler named 'openoffice-linux32-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-w7l10n
Hi! , The aoo-w7l10n builder has just completed a run STATUS: Failure Build revision 1452135 on branch openoffice/branches/l10n 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-w7l10n/builds/38 Build reason was: The Nightly scheduler named 'aoo-win7-l10n' 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: r1452693 - /openoffice/trunk/main/configure.in
Author: hdu Date: Tue Mar 5 08:35:18 2013 New Revision: 1452693 URL: http://svn.apache.org/r1452693 Log: get more detailed info about the build platform's release and version On the mailing lists there are frequently questions about the binary compatibility of provided builds, e.g. from the buildbots. Autoconf and configure are bit skimpy on the details of the build platform so the questions cannot be easily answered. This change tries to get at least the details provided by /etc/*release and uname. Modified: openoffice/trunk/main/configure.in Modified: openoffice/trunk/main/configure.in URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1452693&r1=1452692&r2=1452693&view=diff == --- openoffice/trunk/main/configure.in (original) +++ openoffice/trunk/main/configure.in Tue Mar 5 08:35:18 2013 @@ -1109,6 +1109,10 @@ else CygwinVer="false" fi +# get info about the system provided release/version details +head /etc/*-release +uname -a + dnl === dnl The following is a list of supported systems. dnl Sequential to keep the logic very simple
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1452657 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/535 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
[CONF] Apache OpenOffice Community > Tips for branch ia2
Space: Apache OpenOffice Community
(https://cwiki.apache.org/confluence/display/OOOUSERS)
Page: Tips for branch ia2
(https://cwiki.apache.org/confluence/display/OOOUSERS/Tips+for+branch+ia2)
Edited by Steve Yin:
-
Configuration parameters for building:
{code}
./configure \
--with-ant-home=/cygdrive/d/Apache/BuildTools/apache-ant-1.8.4 \
--with-cl-home=/cygdrive/d/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\
9.0/VC \
--with-mspdb-path=/cygdrive/d/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\
9.0/Common7/IDE \
--with-psdk-home=/cygdrive/d/Apache/BuildTools/MSSDK_v6.1 \
--with-directx-home=/cygdrive/d/Apache/BuildTools/directx \
--with-nsis-path=/cygdrive/d/Program\ Files\ (x86)/NSIS \
--with-frame-home=/cygdrive/d/Apache/BuildTools/MSSDK_v6.1 \
--with-midl-path=/cygdrive/d/Apache/BuildTools/MSSDK_v6.1/Bin \
--with-csc-path=/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5 \
--with-asm-home=/cygdrive/d/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\
9.0/VC/Bin \
--with-jdk-home=/cygdrive/d/Program\ Files\ (x86)/Java/jdk1.6.0_37 \
--with-dmake-url=http://dmake.apache-extras.org.codespot.com/files/dmake-4.12.tar.bz2
\
--with-epm-url=http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/epm/3.7/epm-3.7-source.tar.gz
\
--disable-mozilla --disable-odk --without-junit --enable-verbose
--enable-category-b --enable-bundled-dictionaries --with-dict
{code}
Note: A VC 20xx professional version is indispensable. Do NOT use
"\--disable-directx" and "\--disable-atl".
Binary installation package can be found
here [http://ci.apache.org/projects/openoffice/#w7ia2]
After installation, run the application as administrator to ensure the
application has enough privilege to modify the system registry.
Known issue:
1. AccProbe does not set SPI_SETSCREENREADER flag when running. To enable the
ACC support in this case, check the check box With the text "Support assistive
technology tools" at Tools \-> Options \-> Apache OpenOffice \-> Accessibility
\-> Miscellaneous options. If it was already checked, uncheck it and check
again.
2. The dll registration informations of the "uacccom.dll" in the Windows
registry cannot be removed after the AOO uninstall. This issue will make
firefox's IA2 interfaces inaccessible. It will be fixed in the future.
Thanks for *Simon Eigeldinger* who found and reported the issue.
{color:#22}Two solutions:{color}
{color:#22}1. Search the Windows registry for "uacccom.dll" and remove all
of them.{color}
{color:#22}2. Before the AOO uninstall, new a txt file and copy the
following content and save as a .bat file in the installation folder (such as
”d:\Apache OpenOffice 3“) and run.{color}
{code}
@ECHO OFFset PATH=%PATH%;URE\binregsvr32 /u program\UAccCOM.dll@ECHO OFF
set PATH=%PATH%;URE\bin
regsvr32 /u program\UAccCOM.dll
{code}
Change your notification preferences:
https://cwiki.apache.org/confluence/users/viewnotifications.action
[CONF] Apache OpenOffice Community > Tips for branch ia2
Space: Apache OpenOffice Community
(https://cwiki.apache.org/confluence/display/OOOUSERS)
Page: Tips for branch ia2
(https://cwiki.apache.org/confluence/display/OOOUSERS/Tips+for+branch+ia2)
Edited by Steve Yin:
-
Configuration parameters for building:
{code}
./configure \
--with-ant-home=/cygdrive/d/Apache/BuildTools/apache-ant-1.8.4 \
--with-cl-home=/cygdrive/d/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\
9.0/VC \
--with-mspdb-path=/cygdrive/d/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\
9.0/Common7/IDE \
--with-psdk-home=/cygdrive/d/Apache/BuildTools/MSSDK_v6.1 \
--with-directx-home=/cygdrive/d/Apache/BuildTools/directx \
--with-nsis-path=/cygdrive/d/Program\ Files\ (x86)/NSIS \
--with-frame-home=/cygdrive/d/Apache/BuildTools/MSSDK_v6.1 \
--with-midl-path=/cygdrive/d/Apache/BuildTools/MSSDK_v6.1/Bin \
--with-csc-path=/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5 \
--with-asm-home=/cygdrive/d/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\
9.0/VC/Bin \
--with-jdk-home=/cygdrive/d/Program\ Files\ (x86)/Java/jdk1.6.0_37 \
--with-dmake-url=http://dmake.apache-extras.org.codespot.com/files/dmake-4.12.tar.bz2
\
--with-epm-url=http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/epm/3.7/epm-3.7-source.tar.gz
\
--disable-mozilla --disable-odk --without-junit --enable-verbose
--enable-category-b --enable-bundled-dictionaries --with-dict
{code}
Note: A VC 20xx professional version is indispensable. Do NOT use
"--disable-directx" and "--disable-atl".
Binary installation package can be found
here [http://ci.apache.org/projects/openoffice/#w7ia2]
After installation, run the application as administrator to ensure the
application has enough privilege to modify the system registry.
Known issue:
1. AccProbe does not set SPI_SETSCREENREADER flag when running. To enable the
ACC support in this case, check the check box With the text "Support assistive
technology tools" at Tools \-> Options \-> Apache OpenOffice \-> Accessibility
\-> Miscellaneous options. If it was already checked, uncheck it and check
again.
2. The dll registration informations of the "uacccom.dll" in the Windows
registry cannot be removed after the AOO uninstall. This issue will make
firefox's IA2 interfaces inaccessible. It will be fixed in the future.
Thanks for *Simon Eigeldinger* who found and reported the issue.
{color:#22}Two solutions:{color}
{color:#22}1. Search the Windows registry for "uacccom.dll" and remove all
of them.{color}
{color:#22}2. Before the AOO uninstall, new a txt file and copy the
following content and save as a .bat file in the installation folder (such as
”d:\Apache OpenOffice 3“) and run.{color}
{code}
@ECHO OFFset PATH=%PATH%;URE\binregsvr32 /u program\UAccCOM.dll@ECHO OFF
set PATH=%PATH%;URE\bin
regsvr32 /u program\UAccCOM.dll
{code}
Change your notification preferences:
https://cwiki.apache.org/confluence/users/viewnotifications.action
