svn commit: r1481723 - in /openoffice/trunk/main/sfx2/source/sidebar: AsynchronousCall.cxx IContextChangeReceiver.cxx ILayoutableWindow.cxx
Author: af
Date: Mon May 13 07:40:20 2013
New Revision: 1481723
URL: http://svn.apache.org/r1481723
Log:
122047: Added missing implementation of virtual destructors.
Added:
openoffice/trunk/main/sfx2/source/sidebar/IContextChangeReceiver.cxx
openoffice/trunk/main/sfx2/source/sidebar/ILayoutableWindow.cxx
Modified:
openoffice/trunk/main/sfx2/source/sidebar/AsynchronousCall.cxx
Modified: openoffice/trunk/main/sfx2/source/sidebar/AsynchronousCall.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/AsynchronousCall.cxx?rev=1481723r1=1481722r2=1481723view=diff
==
--- openoffice/trunk/main/sfx2/source/sidebar/AsynchronousCall.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/AsynchronousCall.cxx Mon May 13
07:40:20 2013
@@ -72,7 +72,7 @@ void AsynchronousCall::CancelRequest (vo
if (mnCallId != 0)
{
Application::RemoveUserEvent(mnCallId);
-mnCallId = -1;
+mnCallId = 0;
}
}
Added: openoffice/trunk/main/sfx2/source/sidebar/IContextChangeReceiver.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/IContextChangeReceiver.cxx?rev=1481723view=auto
==
--- openoffice/trunk/main/sfx2/source/sidebar/IContextChangeReceiver.cxx (added)
+++ openoffice/trunk/main/sfx2/source/sidebar/IContextChangeReceiver.cxx Mon
May 13 07:40:20 2013
@@ -0,0 +1,32 @@
+/**
+ *
+ * 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 sfx2/sidebar/IContextChangeReceiver.hxx
+
+
+namespace sfx2 { namespace sidebar {
+
+
+IContextChangeReceiver::~IContextChangeReceiver (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
Added: openoffice/trunk/main/sfx2/source/sidebar/ILayoutableWindow.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/ILayoutableWindow.cxx?rev=1481723view=auto
==
--- openoffice/trunk/main/sfx2/source/sidebar/ILayoutableWindow.cxx (added)
+++ openoffice/trunk/main/sfx2/source/sidebar/ILayoutableWindow.cxx Mon May 13
07:40:20 2013
@@ -0,0 +1,32 @@
+/**
+ *
+ * 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 sfx2/sidebar/ILayoutableWindow.hxx
+
+
+namespace sfx2 { namespace sidebar {
+
+
+ILayoutableWindow::~ILayoutableWindow (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
buildbot failure in ASF Buildbot on aoo-w7snap
Hi! , The aoo-w7snap builder has just completed a run STATUS: Failure Build revision 1479897 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/52 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: r1481741 - in /openoffice/trunk/ext_libraries: apr/prj/build.lst coinmp/prj/build.lst coinmp/prj/d.lst ratscan/prj/build.lst serf/prj/build.lst
Author: af Date: Mon May 13 09:13:01 2013 New Revision: 1481741 URL: http://svn.apache.org/r1481741 Log: Fixed CRLF line breaks in some build.lst and d.lst files. Modified: openoffice/trunk/ext_libraries/apr/prj/build.lst openoffice/trunk/ext_libraries/coinmp/prj/build.lst openoffice/trunk/ext_libraries/coinmp/prj/d.lst openoffice/trunk/ext_libraries/ratscan/prj/build.lst openoffice/trunk/ext_libraries/serf/prj/build.lst Modified: openoffice/trunk/ext_libraries/apr/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/prj/build.lst?rev=1481741r1=1481740r2=1481741view=diff == --- openoffice/trunk/ext_libraries/apr/prj/build.lst (original) +++ openoffice/trunk/ext_libraries/apr/prj/build.lst Mon May 13 09:13:01 2013 @@ -1,3 +1,3 @@ -apr apr : solenv NULL -apr apr usr1- all apr_mkout NULL -apr apr nmake - all apr_apr NULL +apr apr : solenv NULL +apr apr usr1- all apr_mkout NULL +apr apr nmake - all apr_apr NULL Modified: openoffice/trunk/ext_libraries/coinmp/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/prj/build.lst?rev=1481741r1=1481740r2=1481741view=diff == --- openoffice/trunk/ext_libraries/coinmp/prj/build.lst (original) +++ openoffice/trunk/ext_libraries/coinmp/prj/build.lst Mon May 13 09:13:01 2013 @@ -1,3 +1,3 @@ -coin coinmp : soltools NULL -coin coinmp usr1- all coin_mkout NULL -coin coinmp nmake - all coin_coinmp NULL +coin coinmp : soltools NULL +coin coinmp usr1- all coin_mkout NULL +coin coinmp nmake - all coin_coinmp NULL Modified: openoffice/trunk/ext_libraries/coinmp/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/prj/d.lst?rev=1481741r1=1481740r2=1481741view=diff == --- openoffice/trunk/ext_libraries/coinmp/prj/d.lst (original) +++ openoffice/trunk/ext_libraries/coinmp/prj/d.lst Mon May 13 09:13:01 2013 @@ -1,4 +1,4 @@ -mkdir: %_DEST%\inc%_EXT%\coinmp -..\%__SRC%\bin\CoinMP.dll %_DEST%\bin%_EXT%\ -..\%__SRC%\lib\* %_DEST%\lib%_EXT% -..\%__SRC%\inc\CoinMP.h %_DEST%\inc%_EXT%\coinmp +mkdir: %_DEST%\inc%_EXT%\coinmp +..\%__SRC%\bin\CoinMP.dll %_DEST%\bin%_EXT%\ +..\%__SRC%\lib\* %_DEST%\lib%_EXT% +..\%__SRC%\inc\CoinMP.h %_DEST%\inc%_EXT%\coinmp Modified: openoffice/trunk/ext_libraries/ratscan/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/ratscan/prj/build.lst?rev=1481741r1=1481740r2=1481741view=diff == --- openoffice/trunk/ext_libraries/ratscan/prj/build.lst (original) +++ openoffice/trunk/ext_libraries/ratscan/prj/build.lst Mon May 13 09:13:01 2013 @@ -1,4 +1,4 @@ -rat rat : saxon NULL -rat rat usr1- all rat_mkout NULL -rat rat\rat nmake - all rat_rat NULL -rat rat\scan nmake - all rat_scan rat_rat NULL +rat rat : saxon NULL +rat rat usr1- all rat_mkout NULL +rat rat\rat nmake - all rat_rat NULL +rat rat\scan nmake - all rat_scan rat_rat NULL Modified: openoffice/trunk/ext_libraries/serf/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/prj/build.lst?rev=1481741r1=1481740r2=1481741view=diff == --- openoffice/trunk/ext_libraries/serf/prj/build.lst (original) +++ openoffice/trunk/ext_libraries/serf/prj/build.lst Mon May 13 09:13:01 2013 @@ -1,3 +1,3 @@ -serf serf : APR_UTIL:apr-util OPENSSL:openssl NULL -serf serf usr1-all serf_mkout NULL -serf serf nmake- all serf_serf NULL +serf serf : APR_UTIL:apr-util OPENSSL:openssl NULL +serf serf usr1-all serf_mkout NULL +serf serf nmake- all serf_serf NULL
svn commit: r1481752 - /openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpercxx.map
Author: hdu
Date: Mon May 13 09:36:32 2013
New Revision: 1481752
URL: http://svn.apache.org/r1481752
Log:
#i122195# add missing map for UNO's purple-environment
Added:
openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpercxx.map
Added: openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpercxx.map
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpercxx.map?rev=1481752view=auto
==
--- openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpercxx.map
(added)
+++ openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpercxx.map
Mon May 13 09:36:32 2013
@@ -0,0 +1,28 @@
+###
+#
+# 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.
+#
+###
+UDK_3_0_0 {
+ global:
+
_ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
+
_ZN4cppu6helper7purpenv29Environment_initWithEnterableEP16_uno_EnvironmentPNS_9EnterableE;
+
+ local:
+ *;
+};
svn commit: r1481759 - /openoffice/branches/rejuvenate01/main/vcl/source/gdi/impfont.cxx
Author: hdu
Date: Mon May 13 09:46:13 2013
New Revision: 1481759
URL: http://svn.apache.org/r1481759
Log:
#i122301# the new file impfont.hxx consolidates many internal font helper
methods
Added:
openoffice/branches/rejuvenate01/main/vcl/source/gdi/impfont.cxx
Added: openoffice/branches/rejuvenate01/main/vcl/source/gdi/impfont.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/gdi/impfont.cxx?rev=1481759view=auto
==
--- openoffice/branches/rejuvenate01/main/vcl/source/gdi/impfont.cxx (added)
+++ openoffice/branches/rejuvenate01/main/vcl/source/gdi/impfont.cxx Mon May 13
09:46:13 2013
@@ -0,0 +1,871 @@
+/**
+ *
+ * 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.
+ *
+ */
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include precompiled_vcl.hxx
+
+#include vcl/metric.hxx
+#include outfont.hxx
+#include impfont.hxx
+
+#include vector
+#include set
+
+// ===
+
+CmapResult::CmapResult( bool bSymbolic,
+ const sal_UCS4* pRangeCodes, int nRangeCount,
+ const int* pStartGlyphs, const sal_uInt16* pExtraGlyphIds )
+: mpRangeCodes( pRangeCodes)
+, mpStartGlyphs( pStartGlyphs)
+, mpGlyphIds( pExtraGlyphIds)
+, mnRangeCount( nRangeCount)
+, mbSymbolic( bSymbolic)
+, mbRecoded( false)
+{}
+
+// ===
+
+ImplFontCharMap::ImplFontCharMap( const CmapResult rCR )
+: mpRangeCodes( rCR.mpRangeCodes )
+, mpStartGlyphs( rCR.mpStartGlyphs )
+, mpGlyphIds( rCR.mpGlyphIds )
+, mnRangeCount( rCR.mnRangeCount )
+, mnCharCount( 0 )
+, mnRefCount( 1 )
+{
+ const sal_UCS4* pRangePtr = mpRangeCodes;
+ for( int i = mnRangeCount; --i = 0; pRangePtr += 2 )
+ {
+ sal_UCS4 cFirst = pRangePtr[0];
+ sal_UCS4 cLast = pRangePtr[1];
+ mnCharCount += cLast - cFirst;
+ }
+}
+
+static ImplFontCharMap* pDefaultImplFontCharMap = NULL;
+static const sal_UCS4 aDefaultUnicodeRanges[] = {0x0020,0xD800, 0xE000,0xFFF0};
+static const sal_UCS4 aDefaultSymbolRanges[] = {0x0020,0x0100, 0xF020,0xF100};
+
+// ---
+
+bool ImplFontCharMap::IsDefaultMap() const
+{
+ const bool bIsDefault = (mpRangeCodes == aDefaultUnicodeRanges) ||
(mpRangeCodes == aDefaultSymbolRanges);
+ return bIsDefault;
+}
+
+// ---
+
+ImplFontCharMap::~ImplFontCharMap()
+{
+ if( IsDefaultMap() )
+ return;
+ delete[] mpRangeCodes;
+ delete[] mpStartGlyphs;
+ delete[] mpGlyphIds;
+}
+
+// ---
+
+ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols)
+{
+ if( pDefaultImplFontCharMap )
+ pDefaultImplFontCharMap-AddReference();
+ else
+ {
+ const sal_UCS4* pRangeCodes = aDefaultUnicodeRanges;
+ int nCodesCount = sizeof(aDefaultUnicodeRanges) /
sizeof(*pRangeCodes);
+ if( bSymbols )
+ {
+ pRangeCodes = aDefaultSymbolRanges;
+ nCodesCount = sizeof(aDefaultSymbolRanges) /
sizeof(*pRangeCodes);
+ }
+
+ CmapResult aDefaultCR( bSymbols, pRangeCodes, nCodesCount/2 );
+ pDefaultImplFontCharMap = new ImplFontCharMap( aDefaultCR );
+ }
+
+ return pDefaultImplFontCharMap;
+}
+
+// ---
+
+void ImplFontCharMap::AddReference( void) const
+{
+ ++mnRefCount;
+}
+
+// ---
+
+void ImplFontCharMap::DeReference( void) const
+{
+ if( --mnRefCount = 0 )
+ if( this != pDefaultImplFontCharMap )
+ delete
svn commit: r1481789 - /openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx
Author: af Date: Mon May 13 11:00:09 2013 New Revision: 1481789 URL: http://svn.apache.org/r1481789 Log: 122272: Select correct sidebar button after changing decks via menu. Modified: openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx Modified: openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx?rev=1481789r1=1481788r2=1481789view=diff == --- openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx (original) +++ openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx Mon May 13 11:00:09 2013 @@ -488,6 +488,7 @@ void SidebarController::SwitchToDeck ( msCurrentDeckId = rDeckDescriptor.msId; } +mpTabBar-HighlightDeck(msCurrentDeckId); // Determine the panels to display in the deck. ResourceManager::PanelContextDescriptorContainer aPanelContextDescriptors;
svn commit: r1481844 - in /openoffice/trunk/main/sd/source/ui/view: drviews1.cxx drviewsa.cxx
Author: af Date: Mon May 13 13:34:46 2013 New Revision: 1481844 URL: http://svn.apache.org/r1481844 Log: 122275: Don't show the layout panel for master pages. Modified: openoffice/trunk/main/sd/source/ui/view/drviews1.cxx openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx Modified: openoffice/trunk/main/sd/source/ui/view/drviews1.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drviews1.cxx?rev=1481844r1=1481843r2=1481844view=diff == --- openoffice/trunk/main/sd/source/ui/view/drviews1.cxx (original) +++ openoffice/trunk/main/sd/source/ui/view/drviews1.cxx Mon May 13 13:34:46 2013 @@ -516,6 +516,11 @@ void DrawViewShell::ChangeEditMode(EditM Invalidate( SID_TITLE_MASTERPAGE ); Invalidate( SID_NOTES_MASTERPAGE ); Invalidate( SID_HANDOUT_MASTERPAGE ); + +if (meEditMode == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); +else + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage)); } } Modified: openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx?rev=1481844r1=1481843r2=1481844view=diff == --- openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx (original) +++ openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx Mon May 13 13:34:46 2013 @@ -156,7 +156,10 @@ DrawViewShell::DrawViewShell( SfxViewFra mpSelectionChangeHandler-Connect(); - SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); + if (mpFrameView-GetViewShEditMode(mePageKind) == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); + else + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage)); } /*
svn commit: r1481916 - in /openoffice/trunk/main: sd/source/ui/view/drviewsa.cxx svx/inc/svx/sidebar/SelectionAnalyzer.hxx svx/source/sidebar/SelectionAnalyzer.cxx
Author: af
Date: Mon May 13 15:25:51 2013
New Revision: 1481916
URL: http://svn.apache.org/r1481916
Log:
121981: Don't change sidebar context while in Impress table.
Modified:
openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx
openoffice/trunk/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx
Modified: openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx?rev=1481916r1=1481915r2=1481916view=diff
==
--- openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx Mon May 13 15:25:51
2013
@@ -871,14 +871,10 @@ void DrawViewShell::GetAnnotationState (
}
+
+
EnumContext::Context DrawViewShell::GetContextForSelection (void) const
{
-if (mpDrawView-GetMarkedObjectList().GetMarkCount() == 1)
-if (mpDrawView-GetTextEditObject() != NULL)
-if (mpDrawView-GetTextEditOutlinerView() != NULL)
- return EnumContext::Context_DrawText;
-
-// All other cases are handled by the SelectionAnalyzer.
return ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SD(
mpDrawView-GetMarkedObjectList(),
meEditMode == EM_MASTERPAGE,
Modified: openoffice/trunk/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx?rev=1481916r1=1481915r2=1481916view=diff
==
--- openoffice/trunk/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx Mon May 13
15:25:51 2013
@@ -31,6 +31,11 @@ class SdrObject;
namespace svx { namespace sidebar {
+/** Analyze the current selection of Calc or Draw/Impress documents
+and return the associated sidebar context.
+
+The decision is based on heuristics. Do not expect pretty code.
+*/
class SVX_DLLPUBLIC SelectionAnalyzer
{
public :
Modified: openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx?rev=1481916r1=1481915r2=1481916view=diff
==
--- openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx Mon May 13
15:25:51 2013
@@ -122,9 +122,17 @@ EnumContext::Context SelectionAnalyzer::
case 1:
{
SdrObject* pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-if ( pObj-ISA(SdrTextObj) ((SdrTextObj*)pObj)-IsInEditMode() )
+if (pObj-ISA(SdrTextObj) ((SdrTextObj*)pObj)-IsInEditMode())
{
-eContext = EnumContext::Context_DrawText;
+if (pObj-GetObjIdentifier() == OBJ_TABLE)
+{
+// Let a table object take precedence over text
+// edit mode. The panels for text editing are
+// present for table context as well, anyway.
+eContext = EnumContext::Context_Table;
+}
+else
+eContext = EnumContext::Context_DrawText;
}
else
{
svn commit: r1481943 - /openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
Author: paveljanik
Date: Mon May 13 15:50:20 2013
New Revision: 1481943
URL: http://svn.apache.org/r1481943
Log:
Retype values properly to prevent compiler warnings.
Modified:
openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
Modified: openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx?rev=1481943r1=1481942r2=1481943view=diff
==
--- openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx Mon May 13
15:50:20 2013
@@ -282,7 +282,7 @@ bool FocusManager::IsDeckTitleVisible (v
void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
{
-if (nPanelIndex0 || nPanelIndex=maPanels.size())
+if (nPanelIndex0 || nPanelIndex=static_castsal_Int32(maPanels.size()))
return;
Panel rPanel (*maPanels[nPanelIndex]);
TitleBar* pTitleBar = rPanel.GetTitleBar();
@@ -496,7 +496,7 @@ void FocusManager::HandleKeyEvent (
case PC_PanelToolBox:
case PC_PanelContent:
// Go to next panel.
-if (aLocation.mnIndex maPanels.size()-1)
+if (aLocation.mnIndex
static_castsal_Int32(maPanels.size())-1)
FocusPanel(aLocation.mnIndex+1);
else
FocusButton(0);
@@ -510,7 +510,7 @@ void FocusManager::HandleKeyEvent (
case PC_TabBar:
// Go to next tab bar item.
-if (aLocation.mnIndex maButtons.size()-1)
+if (aLocation.mnIndex
static_castsal_Int32(maButtons.size())-1)
FocusButton(aLocation.mnIndex + 1);
else if (IsDeckTitleVisible())
FocusDeckTitle();
svn commit: r1482046 - in /openoffice/devtools/aoo-stats: 34x.lst get-aoo-stats.py
Author: robweir Date: Mon May 13 19:44:15 2013 New Revision: 1482046 URL: http://svn.apache.org/r1482046 Log: Added 3.4.1 respin languages to 34x.lst. Also improved exception handling when null JSON objects are returned. Modified: openoffice/devtools/aoo-stats/34x.lst openoffice/devtools/aoo-stats/get-aoo-stats.py Modified: openoffice/devtools/aoo-stats/34x.lst URL: http://svn.apache.org/viewvc/openoffice/devtools/aoo-stats/34x.lst?rev=1482046r1=1482045r2=1482046view=diff == --- openoffice/devtools/aoo-stats/34x.lst (original) +++ openoffice/devtools/aoo-stats/34x.lst Mon May 13 19:44:15 2013 @@ -208,3 +208,51 @@ http://sourceforge.net/projects/openoffi http://sourceforge.net/projects/openofficeorg.mirror/files/localized/sk/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-rpm_sk.tar.gz http://sourceforge.net/projects/openofficeorg.mirror/files/localized/sk/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-deb_sk.tar.gz http://sourceforge.net/projects/openofficeorg.mirror/files/localized/sk/3.4.1/Apache_OpenOffice_incubating_3.4.1_MacOS_x86_install_sk.dmg +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/eu/3.4.1/Apache_OpenOffice_incubating_3.4.1_Win_x86_install_eu.exe +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/eu/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-rpm_eu.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/eu/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-deb_eu.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/eu/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-rpm_eu.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/eu/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-deb_eu.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/eu/3.4.1/Apache_OpenOffice_incubating_3.4.1_MacOS_x86_install_eu.dmg +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/da/3.4.1/Apache_OpenOffice_incubating_3.4.1_Win_x86_install_da.exe +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/da/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-rpm_da.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/da/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-deb_da.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/da/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-rpm_da.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/da/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-deb_da.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/da/3.4.1/Apache_OpenOffice_incubating_3.4.1_MacOS_x86_install_da.dmg +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/gd/3.4.1/Apache_OpenOffice_incubating_3.4.1_Win_x86_install_gd.exe +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/gd/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-rpm_gd.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/gd/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-deb_gd.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/gd/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-rpm_gd.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/gd/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-deb_gd.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/gd/3.4.1/Apache_OpenOffice_incubating_3.4.1_MacOS_x86_install_gd.dmg +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/ko/3.4.1/Apache_OpenOffice_incubating_3.4.1_Win_x86_install_ko.exe +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/ko/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-rpm_ko.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/ko/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-deb_ko.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/ko/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-rpm_ko.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/ko/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-deb_ko.tar.gz +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/ko/3.4.1/Apache_OpenOffice_incubating_3.4.1_MacOS_x86_install_ko.dmg +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_Win_x86_install_nb.exe +http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-rpm_nb.tar.gz
svn commit: r1482063 - /openoffice/devtools/aoo-stats/detail-by-day.py
Author: robweir Date: Mon May 13 20:05:31 2013 New Revision: 1482063 URL: http://svn.apache.org/r1482063 Log: New program, to gather stats over a range of dates and output a CSV giving detailed breakdown by platform, country, etc. Added: openoffice/devtools/aoo-stats/detail-by-day.py Added: openoffice/devtools/aoo-stats/detail-by-day.py URL: http://svn.apache.org/viewvc/openoffice/devtools/aoo-stats/detail-by-day.py?rev=1482063view=auto == --- openoffice/devtools/aoo-stats/detail-by-day.py (added) +++ openoffice/devtools/aoo-stats/detail-by-day.py Mon May 13 20:05:31 2013 @@ -0,0 +1,228 @@ + +# +# 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. +# + + + +# This script queries the SourceForce REST API for download statistics for +# sets of files on SourceForge, for a range of dates, in ISO format (-MM-DD) +# passed in as a command line argument. The data, in CSV format is written to stdout + + +import urllib +import json +import sys +import datetime + +from urllib import urlencode + +def getSourceForgeStats(download, startDate, endDate): + +url = download + /stats/json?start_date= + startDate + end_date= + endDate + +attempts = 0 + +while attempts 3: +try: +conn = urllib.urlopen(url) +data = conn.read() + +return data + +except: +attempts += 1 +print url +print error + str(attempts) + +return + + +if len(sys.argv) != 4: +print syntax: python detail-by-day.py urls.lst start-date end-date +print where file.list is a list of files URL's to gather stats on, and start-date and end-date are in -MM-DD format. +exit(-1) + + +downloads = [line.strip() for line in open(sys.argv[1])] +start_date = datetime.datetime.strptime(sys.argv[2], '%Y-%m-%d') +end_date = datetime.datetime.strptime(sys.argv[3], '%Y-%m-%d') + +print 'date,count_total,count_340,count_341,windows,mac,linux,linux32,linux64,deb,rpm,ar,ast,eu,zh_TW,zh_CN,cs,da,nl,en_GB,en_US,fi,fr,gd,gl,de,hu,it,ja,km,ko,nb,pl,pt_BR,ru,sk,sl,es,sv' + +today = start_date + +while today = end_date: + +linux32 = 0 +linux64 = 0 +windows = 0 +mac = 0 +linux = 0 +count_total = 0 +count_340 = 0 +count_341 = 0 +deb = 0 +rpm = 0 + +ar = 0 +ast = 0 +eu = 0 +zh_TW = 0 +zh_CN = 0 +cs = 0 +da = 0 +nl = 0 +en_GB = 0 +en_US = 0 +fi = 0 +fr = 0 +gd = 0 +gl = 0 +de = 0 +hu = 0 +it = 0 +ja = 0 +km = 0 +ko = 0 +nb = 0 +pl = 0 +pt_BR = 0 +ru = 0 +sk = 0 +sl = 0 +es = 0 +sv = 0 + +date_string = today.strftime(%Y-%m-%d) + +for download in downloads : + +try: +data = json.loads(getSourceForgeStats(download,date_string,date_string)) +day_count = data[total] +except ValueError: +data = +day_count = 0 + +count_total = count_total + day_count + +#versions + +if download.find(3.4.0) != -1: +count_340 = count_340 + day_count + +if download.find(3.4.1) != -1: +count_341 = count_341 + day_count + +#platforms + +if download.find(Win_x86) != -1: +windows = windows + day_count + +if download.find(MacOS) != -1: +mac = mac + day_count + +if download.find(Linux) != -1: +linux = linux + day_count + +#architecture + +if download.find(Linux_x86_) != -1: +linux32 = linux32 + day_count + +if download.find(Linux_x86-64_) != -1: +linux64 = linux64 + day_count + +#packaging + +if download.find(install-deb_) != -1: +deb = deb + day_count + +if download.find(install-rpm_) != -1: +rpm = rpm + day_count + +#languages + +if download.find(_ar.) != -1: +ar = ar + day_count +if download.find(_ast.) != -1: +ast = ast+ day_count +if
svn commit: r1482157 - /openoffice/trunk/main/i18npool/source/localedata/data/gl_ES.xml
Author: arielch Date: Tue May 14 00:23:03 2013 New Revision: 1482157 URL: http://svn.apache.org/r1482157 Log: i122306 - Remove dot from abbreviate day and month names in Galician Modified: openoffice/trunk/main/i18npool/source/localedata/data/gl_ES.xml Modified: openoffice/trunk/main/i18npool/source/localedata/data/gl_ES.xml URL: http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/localedata/data/gl_ES.xml?rev=1482157r1=1482156r2=1482157view=diff == --- openoffice/trunk/main/i18npool/source/localedata/data/gl_ES.xml (original) +++ openoffice/trunk/main/i18npool/source/localedata/data/gl_ES.xml Tue May 14 00:23:03 2013 @@ -204,99 +204,99 @@ DaysOfWeek Day DayIDsun/DayID - DefaultAbbrvNamedom./DefaultAbbrvName + DefaultAbbrvNamedom/DefaultAbbrvName DefaultFullNamedomingo/DefaultFullName /Day Day DayIDmon/DayID - DefaultAbbrvNamelun./DefaultAbbrvName + DefaultAbbrvNamelun/DefaultAbbrvName DefaultFullNameluns/DefaultFullName /Day Day DayIDtue/DayID - DefaultAbbrvNamemar./DefaultAbbrvName + DefaultAbbrvNamemar/DefaultAbbrvName DefaultFullNamemartes/DefaultFullName /Day Day DayIDwed/DayID - DefaultAbbrvNamemér./DefaultAbbrvName + DefaultAbbrvNamemér/DefaultAbbrvName DefaultFullNamemércores/DefaultFullName /Day Day DayIDthu/DayID - DefaultAbbrvNamexov./DefaultAbbrvName + DefaultAbbrvNamexov/DefaultAbbrvName DefaultFullNamexoves/DefaultFullName /Day Day DayIDfri/DayID - DefaultAbbrvNameven./DefaultAbbrvName + DefaultAbbrvNameven/DefaultAbbrvName DefaultFullNamevenres/DefaultFullName /Day Day DayIDsat/DayID - DefaultAbbrvNamesáb./DefaultAbbrvName + DefaultAbbrvNamesáb/DefaultAbbrvName DefaultFullNamesábado/DefaultFullName /Day /DaysOfWeek MonthsOfYear Month MonthIDjan/MonthID - DefaultAbbrvNamexan./DefaultAbbrvName + DefaultAbbrvNamexan/DefaultAbbrvName DefaultFullNamexaneiro/DefaultFullName /Month Month MonthIDfeb/MonthID - DefaultAbbrvNamefeb./DefaultAbbrvName + DefaultAbbrvNamefeb/DefaultAbbrvName DefaultFullNamefebreiro/DefaultFullName /Month Month MonthIDmar/MonthID - DefaultAbbrvNamemar./DefaultAbbrvName + DefaultAbbrvNamemar/DefaultAbbrvName DefaultFullNamemarzo/DefaultFullName /Month Month MonthIDapr/MonthID - DefaultAbbrvNameabr./DefaultAbbrvName + DefaultAbbrvNameabr/DefaultAbbrvName DefaultFullNameabril/DefaultFullName /Month Month MonthIDmay/MonthID - DefaultAbbrvNamemai./DefaultAbbrvName + DefaultAbbrvNamemai/DefaultAbbrvName DefaultFullNamemaio/DefaultFullName /Month Month MonthIDjun/MonthID - DefaultAbbrvNamexuñ./DefaultAbbrvName + DefaultAbbrvNamexuñ/DefaultAbbrvName DefaultFullNamexuño/DefaultFullName /Month Month MonthIDjul/MonthID - DefaultAbbrvNamexul./DefaultAbbrvName + DefaultAbbrvNamexul/DefaultAbbrvName DefaultFullNamexullo/DefaultFullName /Month Month MonthIDaug/MonthID - DefaultAbbrvNameago./DefaultAbbrvName + DefaultAbbrvNameago/DefaultAbbrvName DefaultFullNameagosto/DefaultFullName /Month Month MonthIDsep/MonthID - DefaultAbbrvNameset./DefaultAbbrvName + DefaultAbbrvNameset/DefaultAbbrvName DefaultFullNamesetembro/DefaultFullName /Month Month MonthIDoct/MonthID - DefaultAbbrvNameout./DefaultAbbrvName + DefaultAbbrvNameout/DefaultAbbrvName DefaultFullNameoutubro/DefaultFullName /Month Month MonthIDnov/MonthID - DefaultAbbrvNamenov./DefaultAbbrvName + DefaultAbbrvNamenov/DefaultAbbrvName DefaultFullNamenovembro/DefaultFullName /Month Month MonthIDdec/MonthID - DefaultAbbrvNamedec./DefaultAbbrvName + DefaultAbbrvNamedec/DefaultAbbrvName DefaultFullNamedecembro/DefaultFullName /Month /MonthsOfYear
buildbot failure in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Failure Build revision 1476794 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/102 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
