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/118 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
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1486509 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/619 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
svn commit: r1486582 - in /openoffice/trunk/main/sc/source: core/data/bcaslot.cxx core/inc/bcaslot.hxx filter/excel/xeescher.cxx
Author: hdu
Date: Mon May 27 11:27:43 2013
New Revision: 1486582
URL: http://svn.apache.org/r1486582
Log:
#i122208# const SC containers cannot provide non-const iterators
Modified:
openoffice/trunk/main/sc/source/core/data/bcaslot.cxx
openoffice/trunk/main/sc/source/core/inc/bcaslot.hxx
openoffice/trunk/main/sc/source/filter/excel/xeescher.cxx
Modified: openoffice/trunk/main/sc/source/core/data/bcaslot.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/bcaslot.cxx?rev=1486582r1=1486581r2=1486582view=diff
==
--- openoffice/trunk/main/sc/source/core/data/bcaslot.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/bcaslot.cxx Mon May 27 11:27:43
2013
@@ -232,7 +232,7 @@ void ScBroadcastAreaSlot::EndListeningAr
DBG_ASSERT(pListener, EndListeningArea: pListener Null);
if ( !rpArea )
{
-ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange));
+ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange));
if (aIter == aBroadcastAreaTbl.end())
return;
rpArea = *aIter;
@@ -251,7 +251,7 @@ void ScBroadcastAreaSlot::EndListeningAr
{
if ( !rpArea-GetBroadcaster().HasListeners() )
{
-ScBroadcastAreas::iterator aIter( FindBroadcastArea( rRange));
+ScBroadcastAreas::const_iterator aIter( FindBroadcastArea(
rRange));
if (aIter == aBroadcastAreaTbl.end())
return;
DBG_ASSERT( *aIter == rpArea, EndListeningArea: area pointer
mismatch);
@@ -266,7 +266,7 @@ void ScBroadcastAreaSlot::EndListeningAr
}
-ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea(
+ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea(
const ScRange rRange ) const
{
aTmpSeekBroadcastArea.UpdateRange( rRange);
Modified: openoffice/trunk/main/sc/source/core/inc/bcaslot.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/inc/bcaslot.hxx?rev=1486582r1=1486581r2=1486582view=diff
==
--- openoffice/trunk/main/sc/source/core/inc/bcaslot.hxx (original)
+++ openoffice/trunk/main/sc/source/core/inc/bcaslot.hxx Mon May 27 11:27:43
2013
@@ -128,7 +128,7 @@ private:
ScDocument* pDoc;
ScBroadcastAreaSlotMachine* pBASM;
-ScBroadcastAreas::iterator FindBroadcastArea( const ScRange rRange )
const;
+ScBroadcastAreas::const_iterator FindBroadcastArea( const ScRange rRange
) const;
/**
More hypothetical (memory would probably be doomed anyway) check
Modified: openoffice/trunk/main/sc/source/filter/excel/xeescher.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/filter/excel/xeescher.cxx?rev=1486582r1=1486581r2=1486582view=diff
==
--- openoffice/trunk/main/sc/source/filter/excel/xeescher.cxx (original)
+++ openoffice/trunk/main/sc/source/filter/excel/xeescher.cxx Mon May 27
11:27:43 2013
@@ -1149,12 +1149,13 @@ void XclExpComments::SaveXml( XclExpXmlS
rComments-endElement( XML_authors );
rComments-startElement( XML_commentList, FSEND );
+Authors::const_iterator aAuthorsBegin = aAuthors.begin();
for( size_t i = 0; i nNotes; ++i )
{
XclExpNoteList::RecordRefType xNote = mrNotes.GetRecord( i );
Authors::const_iterator aAuthor = aAuthors.find(
XclXmlUtils::ToOUString( xNote-GetAuthor() ) );
-sal_Int32 nAuthorId = distance( aAuthors.begin(), aAuthor );
+sal_Int32 nAuthorId = distance( aAuthorsBegin, aAuthor );
xNote-WriteXml( nAuthorId, rStrm );
}
svn commit: r1486564 - in /openoffice/trunk/ext_libraries/apr: apr-1.4.5-windows.patch makefile.mk
Author: orw Date: Mon May 27 10:38:34 2013 New Revision: 1486564 URL: http://svn.apache.org/r1486564 Log: module apr: simplify apr's Windows makefile to avoid possible hanging process on buildbots Added: openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch Modified: openoffice/trunk/ext_libraries/apr/makefile.mk Added: openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch?rev=1486564view=auto == --- openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch (added) +++ openoffice/trunk/ext_libraries/apr/apr-1.4.5-windows.patch Mon May 27 10:38:34 2013 @@ -0,0 +1,15 @@ +--- misc/apr-1.4.5/Makefile.win2011-01-28 03:27:19.0 +0100 misc/build/apr-1.4.5/Makefile.win 2013-05-27 11:35:37.224622100 +0200 +@@ -45,12 +45,7 @@ + + PREFIX=..\apr-dist + +-!IF [$(COMSPEC) /c cl /nologo /? \ +- | $(SystemRoot)\System32\find.exe x64 NUL ] == 0 +-ARCH=x64 Release +-!ELSE + ARCH=Win32 Release +-!ENDIF + + !MESSAGE ARCH= $(ARCH) + !MESSAGE PREFIX = $(PREFIX) (install path) Modified: openoffice/trunk/ext_libraries/apr/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr/makefile.mk?rev=1486564r1=1486563r2=1486564view=diff == --- openoffice/trunk/ext_libraries/apr/makefile.mk (original) +++ openoffice/trunk/ext_libraries/apr/makefile.mk Mon May 27 10:38:34 2013 @@ -44,16 +44,15 @@ APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(A TARFILE_NAME=$(PRJNAME)-$(APRVERSION) TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1 -PATCH_FILES=apr-1.4.5.patch +PATCH_FILES= $(TARFILE_NAME).patch .IF $(OS)==WNT +PATCH_FILES+= $(TARFILE_NAME)-windows.patch CONFIGURE_ACTION=cp include/apr.hw include/apr.h BUILD_DIR= BUILD_ACTION=INCLUDE=$(INCLUDE);./include nmake -f Makefile.win buildall -#INSTALL_ACTION=cp Release/libapr-1.lib $(OUTDIR)/lib/libapr-1.lib - .ELIF $(GUI) == OS2 @all:
svn commit: r1486581 - in /openoffice/trunk/main/sw: inc/SwNumberTree.hxx source/core/SwNumberTree/SwNodeNum.cxx source/core/SwNumberTree/SwNumberTree.cxx source/core/layout/paintfrm.cxx source/core/u
Author: hdu
Date: Mon May 27 11:25:44 2013
New Revision: 1486581
URL: http://svn.apache.org/r1486581
Log:
#i122208# const SW containers cannot provide non-const iterators
Modified:
openoffice/trunk/main/sw/inc/SwNumberTree.hxx
openoffice/trunk/main/sw/source/core/SwNumberTree/SwNodeNum.cxx
openoffice/trunk/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
openoffice/trunk/main/sw/source/core/unocore/unochart.cxx
Modified: openoffice/trunk/main/sw/inc/SwNumberTree.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/SwNumberTree.hxx?rev=1486581r1=1486580r2=1486581view=diff
==
--- openoffice/trunk/main/sw/inc/SwNumberTree.hxx (original)
+++ openoffice/trunk/main/sw/inc/SwNumberTree.hxx Mon May 27 11:25:44 2013
@@ -478,7 +478,7 @@ protected:
than or equal to the referenced child are valid. All children
greater than the referenced child are invalid.
*/
-mutable tSwNumberTreeChildren::iterator mItLastValid;
+mutable tSwNumberTreeChildren::const_iterator mItLastValid;
#ifdef DBG_UTIL
/**
@@ -547,7 +547,7 @@ protected:
- false only set if aItLastValid is preceeding
the current last valid node
*/
-void SetLastValid(tSwNumberTreeChildren::iterator aItLastValid,
+void SetLastValid(tSwNumberTreeChildren::const_iterator aItLastValid,
bool bValidating = false) const;
/**
@@ -711,7 +711,7 @@ protected:
*/
void ClearObsoletePhantoms();
-tSwNumberTreeChildren::iterator GetIterator(const SwNumberTreeNode *
pChild) const;
+tSwNumberTreeChildren::const_iterator GetIterator(const SwNumberTreeNode *
pChild) const;
/**
Moves all children to a given destination node.
Modified: openoffice/trunk/main/sw/source/core/SwNumberTree/SwNodeNum.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/SwNumberTree/SwNodeNum.cxx?rev=1486581r1=1486580r2=1486581view=diff
==
--- openoffice/trunk/main/sw/source/core/SwNumberTree/SwNodeNum.cxx (original)
+++ openoffice/trunk/main/sw/source/core/SwNumberTree/SwNodeNum.cxx Mon May 27
11:25:44 2013
@@ -223,7 +223,7 @@ bool SwNodeNum::HasCountedChildren() con
{
bool bResult = false;
-tSwNumberTreeChildren::iterator aIt;
+tSwNumberTreeChildren::const_iterator aIt;
for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
{
Modified: openoffice/trunk/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/SwNumberTree/SwNumberTree.cxx?rev=1486581r1=1486580r2=1486581view=diff
==
--- openoffice/trunk/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
(original)
+++ openoffice/trunk/main/sw/source/core/SwNumberTree/SwNumberTree.cxx Mon May
27 11:25:44 2013
@@ -148,14 +148,14 @@ void SwNumberTreeNode::ClearObsoletePhan
void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode)
const
{
-tSwNumberTreeChildren::iterator aValidateIt =
+tSwNumberTreeChildren::const_iterator aValidateIt =
GetIterator(pNode);
if (aValidateIt != mChildren.end())
{
ASSERT((*aValidateIt)-mpParent == this, wrong parent);
-tSwNumberTreeChildren::iterator aIt = mItLastValid;
+tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
// -- OD 2005-10-19 #126009#
// improvement:
@@ -214,7 +214,7 @@ void SwNumberTreeNode::ValidateHierarchi
if ( !(*aIt)-IsRestart()
GetParent() !bParentCounted )
{
-tSwNumberTreeChildren::iterator aParentChildIt =
+tSwNumberTreeChildren::const_iterator aParentChildIt =
GetParent()-GetIterator( this
);
while ( aParentChildIt != GetParent()-mChildren.begin() )
{
@@ -280,7 +280,7 @@ void SwNumberTreeNode::ValidateHierarchi
void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
{
-tSwNumberTreeChildren::iterator aIt = mItLastValid;
+tSwNumberTreeChildren::const_iterator aIt = mItLastValid;
SwNumberTree::tSwNumTreeNumber nTmpNumber = 0;
@@ -684,7 +684,7 @@ void SwNumberTreeNode::RemoveChild(SwNum
return;
}
-tSwNumberTreeChildren::iterator aRemoveIt = GetIterator(pChild);
+tSwNumberTreeChildren::const_iterator aRemoveIt = GetIterator(pChild);
if (aRemoveIt != mChildren.end())
{
@@ -692,7 +692,7 @@ void SwNumberTreeNode::RemoveChild(SwNum
pRemove-mpParent = NULL;
-tSwNumberTreeChildren::iterator aItPred = mChildren.end();
+
svn commit: r1486578 - in /openoffice/trunk/main: sc/source/ui/drawfunc/ sc/source/ui/inc/ sd/source/ui/inc/ sd/source/ui/slidesorter/shell/ sd/source/ui/view/ sfx2/inc/sfx2/ sfx2/source/control/ svx/
Author: af
Date: Mon May 27 11:18:04 2013
New Revision: 1486578
URL: http://svn.apache.org/r1486578
Log:
122332: Don't change sidebar context when switching to other application window.
Modified:
openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx
openoffice/trunk/main/sc/source/ui/inc/drawsh.hxx
openoffice/trunk/main/sd/source/ui/inc/DrawViewShell.hxx
openoffice/trunk/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
openoffice/trunk/main/sd/source/ui/view/drviews1.cxx
openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx
openoffice/trunk/main/sd/source/ui/view/outlnvsh.cxx
openoffice/trunk/main/sd/source/ui/view/viewshel.cxx
openoffice/trunk/main/sfx2/inc/sfx2/shell.hxx
openoffice/trunk/main/sfx2/source/control/shell.cxx
openoffice/trunk/main/svx/inc/svx/sidebar/SelectionAnalyzer.hxx
openoffice/trunk/main/svx/inc/svx/sidebar/SelectionChangeHandler.hxx
openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx
openoffice/trunk/main/svx/source/sidebar/SelectionChangeHandler.cxx
Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx?rev=1486578r1=1486577r2=1486578view=diff
==
--- openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx Mon May 27 11:18:04
2013
@@ -43,6 +43,7 @@
#include svx/fontworkbar.hxx
#include svx/sidebar/SelectionChangeHandler.hxx
#include svx/sidebar/SelectionAnalyzer.hxx
+#include svx/sidebar/ContextChangeEventMultiplexer.hxx
#include drawsh.hxx
#include drawview.hxx
@@ -69,7 +70,7 @@ ScDrawShell::ScDrawShell( ScViewData* pD
SfxShell(pData-GetViewShell()),
pViewData( pData ),
mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
-::boost::bind(ScDrawShell::GetContextForSelection, this),
+::boost::bind(ScDrawShell::GetSidebarContextName, this),
GetFrame()-GetFrame().GetController(),
sfx2::sidebar::EnumContext::Context_Cell))
{
@@ -408,8 +409,25 @@ void ScDrawShell::GetDrawAttrStateForIFB
}
}
-sfx2::sidebar::EnumContext::Context ScDrawShell::GetContextForSelection (void)
+
+
+
+void ScDrawShell::Activate (const sal_Bool bMDI)
+{
+(void)bMDI;
+
+ContextChangeEventMultiplexer::NotifyContextChange(
+GetFrame()-GetFrame().GetController(),
+::sfx2::sidebar::EnumContext::GetContextEnum(
+GetSidebarContextName()));
+}
+
+
+
+
+::rtl::OUString ScDrawShell::GetSidebarContextName (void)
{
-return ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC(
-GetDrawView()-GetMarkedObjectList());
+return sfx2::sidebar::EnumContext::GetContextName(
+::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC(
+GetDrawView()-GetMarkedObjectList()));
}
Modified: openoffice/trunk/main/sc/source/ui/inc/drawsh.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/inc/drawsh.hxx?rev=1486578r1=1486577r2=1486578view=diff
==
--- openoffice/trunk/main/sc/source/ui/inc/drawsh.hxx (original)
+++ openoffice/trunk/main/sc/source/ui/inc/drawsh.hxx Mon May 27 11:18:04 2013
@@ -27,7 +27,6 @@
#include sfx2/shell.hxx
#include shellids.hxx
#include sfx2/module.hxx
-#include sfx2/sidebar/EnumContext.hxx
#include svx/svdmark.hxx
#include tools/link.hxx
#include rtl/ref.hxx
@@ -51,6 +50,7 @@ class ScDrawShell : public SfxShell
#endif
protected:
+ virtual voidActivate(sal_Bool bMDI);
ScViewData* GetViewData() { return pViewData; }
public:
@@ -89,7 +89,7 @@ public:
sal_BoolAreAllObjectsOnLayer(sal_uInt16 nLayerNo,const
SdrMarkList rMark);
void GetDrawAttrStateForIFBX( SfxItemSet rSet );
-::sfx2::sidebar::EnumContext::Context GetContextForSelection (void);
+::rtl::OUString GetSidebarContextName (void);
};
Modified: openoffice/trunk/main/sd/source/ui/inc/DrawViewShell.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/inc/DrawViewShell.hxx?rev=1486578r1=1486577r2=1486578view=diff
==
--- openoffice/trunk/main/sd/source/ui/inc/DrawViewShell.hxx (original)
+++ openoffice/trunk/main/sd/source/ui/inc/DrawViewShell.hxx Mon May 27
11:18:04 2013
@@ -28,7 +28,6 @@
#include tools/AsynchronousCall.hxx
#include sfx2/viewfac.hxx
#include sfx2/viewsh.hxx
-#include sfx2/sidebar/EnumContext.hxx
#include TabControl.hxx
#include pres.hxx
#include svx/sidebar/SelectionChangeHandler.hxx
@@ -371,6 +370,8 @@ public:
*/
virtual bool RelocateToParentWindow (::Window* pParentWindow);
+::rtl::OUString GetSidebarContextName (void) const;
+
protected:
svn commit: r1486583 - /openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
Author: hdu
Date: Mon May 27 11:29:06 2013
New Revision: 1486583
URL: http://svn.apache.org/r1486583
Log:
#i122208# const SD containers cannot provide non-const iterators
Modified:
openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
Modified:
openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx?rev=1486583r1=1486582r2=1486583view=diff
==
--- openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
(original)
+++ openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
Mon May 27 11:29:06 2013
@@ -154,7 +154,7 @@ private:
view::Layouter rLayouter,
const InsertPosition rInsertPosition,
const bool bCreate = true);
-RunContainer::iterator FindRun (const sal_Int32 nRunIndex) const;
+RunContainer::const_iterator FindRun (const sal_Int32 nRunIndex) const;
};
@@ -247,7 +247,7 @@ SharedPageObjectRun InsertAnimator::Impl
if (nRow 0)
return SharedPageObjectRun();
-RunContainer::iterator iRun (maRuns.end());
+RunContainer::const_iterator iRun (maRuns.end());
if (rLayouter.GetColumnCount() == 1)
{
// There is only one run that contains all slides.
@@ -288,7 +288,7 @@ SharedPageObjectRun InsertAnimator::Impl
-InsertAnimator::Implementation::RunContainer::iterator
+InsertAnimator::Implementation::RunContainer::const_iterator
InsertAnimator::Implementation::FindRun (const sal_Int32 nRunIndex) const
{
return std::find_if(
@@ -326,7 +326,7 @@ void InsertAnimator::Implementation::Rem
// Do not remove runs that show the space for the insertion indicator.
if (pRun-mnLocalInsertIndex == -1)
{
-InsertAnimator::Implementation::RunContainer::iterator iRun
(FindRun(pRun-mnRunIndex));
+InsertAnimator::Implementation::RunContainer::const_iterator iRun
(FindRun(pRun-mnRunIndex));
if (iRun != maRuns.end())
{
OSL_ASSERT(*iRun == pRun);
svn commit: r1486584 - /openoffice/trunk/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
Author: hdu
Date: Mon May 27 11:30:17 2013
New Revision: 1486584
URL: http://svn.apache.org/r1486584
Log:
#i122208# fix sd::TransferableData::Representative's assignment operator
Modified:
openoffice/trunk/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
Modified:
openoffice/trunk/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx?rev=1486584r1=1486583r2=1486584view=diff
==
---
openoffice/trunk/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
(original)
+++
openoffice/trunk/main/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
Mon May 27 11:30:17 2013
@@ -50,7 +50,7 @@ public:
: maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {}
Representative (const Representative rOther)
: maBitmap(rOther.maBitmap), mbIsExcluded(rOther.mbIsExcluded) {}
-Representative operator= (Representative rOther)
+Representative operator=( const Representative rOther)
{ if (rOther != this) {maBitmap = rOther.maBitmap; mbIsExcluded =
rOther.mbIsExcluded; }
return *this;
}
svn commit: r1486585 - in /openoffice/trunk/main: canvas/source/vcl/impltools.cxx sc/source/core/data/global.cxx
Author: hdu
Date: Mon May 27 11:34:50 2013
New Revision: 1486585
URL: http://svn.apache.org/r1486585
Log:
#i122378# replace std::iota() with open code
Modified:
openoffice/trunk/main/canvas/source/vcl/impltools.cxx
openoffice/trunk/main/sc/source/core/data/global.cxx
Modified: openoffice/trunk/main/canvas/source/vcl/impltools.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/source/vcl/impltools.cxx?rev=1486585r1=1486584r2=1486585view=diff
==
--- openoffice/trunk/main/canvas/source/vcl/impltools.cxx (original)
+++ openoffice/trunk/main/canvas/source/vcl/impltools.cxx Mon May 27 11:34:50
2013
@@ -297,7 +297,8 @@ namespace vclcanvas
{
// source already has alpha channel - 1:1 mapping,
// i.e. aAlphaMap[0]=0,...,aAlphaMap[255]=255.
-::std::iota( aAlphaMap, aAlphaMap[256], 0 );
+sal_uInt8* p = aAlphaMap;
+for( int n = 0; n 256; ++n) *(p++) = n;
}
else
{
Modified: openoffice/trunk/main/sc/source/core/data/global.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/global.cxx?rev=1486585r1=1486584r2=1486585view=diff
==
--- openoffice/trunk/main/sc/source/core/data/global.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/global.cxx Mon May 27 11:34:50
2013
@@ -1680,7 +1680,9 @@ void ScFuncDesc::fillVisibleArgumentMapp
if (!bHasSuppressedArgs || !pDefArgFlags)
{
_rArguments.resize( nArgCount);
-::std::iota( _rArguments.begin(), _rArguments.end(), 0);
+::std::vectorsal_uInt16::iterator it = _rArguments.begin();
+for( sal_uInt16 n = 0; n nArgCount; ++n, ++it )
+*it = n;
}
_rArguments.reserve( nArgCount);
svn commit: r1486603 - in /openoffice/trunk/main: sfx2/inc/sfx2/sidebar/EnumContext.hxx sfx2/source/sidebar/EnumContext.cxx svx/source/sidebar/text/TextPropertyPanel.cxx svx/source/sidebar/text/TextPr
Author: af
Date: Mon May 27 12:55:37 2013
New Revision: 1486603
URL: http://svn.apache.org/r1486603
Log:
122387: Use the right tool box for font color in text sidebar.
Modified:
openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx
openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
Modified: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx?rev=1486603r1=1486602r2=1486603view=diff
==
--- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx (original)
+++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx Mon May 27
12:55:37 2013
@@ -133,6 +133,7 @@ public:
Application GetApplication_DI (void) const;
const ::rtl::OUString GetContextName (void) const;
+Context GetContext (void) const;
bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther);
Modified: openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx?rev=1486603r1=1486602r2=1486603view=diff
==
--- openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx Mon May 27
12:55:37 2013
@@ -142,6 +142,14 @@ const ::rtl::OUString EnumContext::GetC
+EnumContext::Context EnumContext::GetContext (void) const
+{
+return meContext;
+}
+
+
+
+
bool EnumContext::operator== (const EnumContext aOther)
{
return meApplication==aOther.meApplication
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1486603r1=1486602r2=1486603view=diff
==
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx Mon May
27 12:55:37 2013
@@ -161,10 +161,13 @@ TextPropertyPanel::TextPropertyPanel (
mpToolBoxFontColorBackground(ControlFactory::CreateToolBoxBackground(this)),
mpToolBoxFontColor(ControlFactory::CreateToolBox(
mpToolBoxFontColorBackground.get(),
-rContext.GetApplication_DI() ==
sfx2::sidebar::EnumContext::Application_WriterVariants
-? SVX_RES(TB_FONTCOLOR_SW)
-: SVX_RES(TB_FONTCOLOR),
-rxFrame)),
+SVX_RES(TB_FONTCOLOR),
+rxFrame)),
+
mpToolBoxFontColorBackgroundSW(ControlFactory::CreateToolBoxBackground(this)),
+mpToolBoxFontColorSW(ControlFactory::CreateToolBox(
+mpToolBoxFontColorBackgroundSW.get(),
+SVX_RES(TB_FONTCOLOR_SW),
+rxFrame)),
mpToolBoxHighlightBackground(ControlFactory::CreateToolBoxBackground(this)),
mpToolBoxHighlight(ControlFactory::CreateToolBox(
mpToolBoxHighlightBackground.get(),
@@ -199,6 +202,8 @@ TextPropertyPanel::TextPropertyPanel (
Initialize();
FreeResource();
+
+UpdateFontColorToolbox(rContext);
}
@@ -213,6 +218,7 @@ TextPropertyPanel::~TextPropertyPanel (v
mpToolBoxIncDec.reset();
mpToolBoxFont.reset();
mpToolBoxFontColor.reset();
+mpToolBoxFontColorSW.reset();
mpToolBoxScript.reset();
mpToolBoxScriptSw.reset();
mpToolBoxSpacing.reset();
@@ -222,6 +228,7 @@ TextPropertyPanel::~TextPropertyPanel (v
mpToolBoxIncDecBackground.reset();
mpToolBoxFontBackground.reset();
mpToolBoxFontColorBackground.reset();
+mpToolBoxFontColorBackgroundSW.reset();
mpToolBoxScriptBackground.reset();
mpToolBoxScriptSwBackground.reset();
mpToolBoxSpacingBackground.reset();
@@ -297,6 +304,30 @@ void TextPropertyPanel::HandleContextCha
default:
break;
}
+
+UpdateFontColorToolbox(aContext);
+}
+
+
+
+
+void TextPropertyPanel::UpdateFontColorToolbox (
+const ::sfx2::sidebar::EnumContext aContext)
+{
+bool bIsWriterFontColor (false);
+if (maContext.GetApplication_DI() ==
sfx2::sidebar::EnumContext::Application_WriterVariants)
+if (maContext.GetContext() !=
sfx2::sidebar::EnumContext::Context_DrawText)
+bIsWriterFontColor = true;
+if (bIsWriterFontColor)
+{
+mpToolBoxFontColor-Hide();
+mpToolBoxFontColorSW-Show();
+}
+else
+{
+mpToolBoxFontColor-Show();
+mpToolBoxFontColorSW-Hide();
+}
}
Modified:
buildbot exception in ASF Buildbot on aoo-w7snap
Hi! , The aoo-w7snap builder has just completed a run STATUS: Exception Build revision 1484679 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/55 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: r1486646 - in /openoffice/trunk/main: chart2/source/tools/InternalData.cxx comphelper/source/misc/numberedcollection.cxx connectivity/source/commontools/TSkipDeletedSet.cxx connectivity/so
Author: hdu Date: Mon May 27 15:46:35 2013 New Revision: 1486646 URL: http://svn.apache.org/r1486646 Log: #i122208# include algorithm explicitly if functions from algorithm are used most STLs include relevant parts of it indirectly, but one can not depend on it (seen with MSVC's tr1 headers) Modified: openoffice/trunk/main/chart2/source/tools/InternalData.cxx openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx openoffice/trunk/main/sal/osl/all/debugbase.cxx Modified: openoffice/trunk/main/chart2/source/tools/InternalData.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/tools/InternalData.cxx?rev=1486646r1=1486645r2=1486646view=diff == --- openoffice/trunk/main/chart2/source/tools/InternalData.cxx (original) +++ openoffice/trunk/main/chart2/source/tools/InternalData.cxx Mon May 27 15:46:35 2013 @@ -30,6 +30,7 @@ #include macros.hxx #include rtl/math.hxx +#include algorithm using ::com::sun::star::uno::Sequence; using ::rtl::OUString; Modified: openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx?rev=1486646r1=1486645r2=1486646view=diff == --- openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx (original) +++ openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx Mon May 27 15:46:35 2013 @@ -25,6 +25,7 @@ #include precompiled_comphelper.hxx #include comphelper/numberedcollection.hxx +#include algorithm //___ // includes Modified: openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx?rev=1486646r1=1486645r2=1486646view=diff == --- openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx (original) +++ openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx Mon May 27 15:46:35 2013 @@ -26,6 +26,7 @@ #include TSkipDeletedSet.hxx #include osl/diagnose.h #include rtl/logfile.hxx +#include algorithm using namespace connectivity; // - Modified: openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx?rev=1486646r1=1486645r2=1486646view=diff == --- openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx (original) +++ openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx Mon May 27 15:46:35 2013 @@ -34,9 +34,7 @@ #include comphelper/property.hxx #include comphelper/types.hxx #include connectivity/dbexception.hxx -#ifdef __MINGW32__ #include algorithm -#endif #include resource/ado_res.hrc using namespace connectivity::ado; Modified: openoffice/trunk/main/sal/osl/all/debugbase.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/all/debugbase.cxx?rev=1486646r1=1486645r2=1486646view=diff == --- openoffice/trunk/main/sal/osl/all/debugbase.cxx (original) +++ openoffice/trunk/main/sal/osl/all/debugbase.cxx Mon May 27 15:46:35 2013 @@ -31,6 +31,7 @@ #include osl/diagnose.hxx #include boost/bind.hpp #include vector +#include algorithm // define own ones, independent of OSL_DEBUG_LEVEL: #define DEBUGBASE_ENSURE_(c, f, l, m) \
svn commit: r1486648 - /openoffice/trunk/main/external_deps.lst
Author: hdu Date: Mon May 27 15:52:27 2013 New Revision: 1486648 URL: http://svn.apache.org/r1486648 Log: #i122362# omit fetching of stlport4 tarballs if possible it doesn't make sense to download them if they are not used Modified: openoffice/trunk/main/external_deps.lst Modified: openoffice/trunk/main/external_deps.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1486648r1=1486647r2=1486648view=diff == --- openoffice/trunk/main/external_deps.lst (original) +++ openoffice/trunk/main/external_deps.lst Mon May 27 15:52:27 2013 @@ -168,20 +168,20 @@ if ( true ) URL1 = http://archive.apache.org/dist/apr/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) -if ( true ) +if ( USE_SYSTEM_STL != YES ) MD5 = c441926f3a552ed3e5b274b62e86af16 name = STLport-4.0.tar.gz # This seems to be the original host, but the MD5 sum does not match. # URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download URL2 = $(OOO_EXTRAS)$(MD5)-$(name) -if ( true ) +if ( USE_SYSTEM_STL != YES ) MD5 = 18f577b374d60b3c760a3a3350407632 name = STLport-4.5.tar.gz URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download URL2 = $(OOO_EXTRAS)$(MD5)-$(name) -if ( true ) +if ( USE_SYSTEM_STL != YES ) MD5 = 7376930b0d3f3d77a685d94c4a3acda8 name = STLport-4.5-0119.tar.gz URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
svn commit: r1486650 - in /openoffice/trunk/main: RepositoryFixes.mk solenv/gbuild/gbuild.mk solenv/gbuild/platform/windows.mk solenv/inc/wntmsci11.mk
Author: hdu Date: Mon May 27 15:58:29 2013 New Revision: 1486650 URL: http://svn.apache.org/r1486650 Log: #i122378# allow linking against MSVC TR1's STL libraries instead of stlport the standard C++ library on MSVC is available in LIBCPMT.LIB and MSVCPRT.LIB (the static and dynamic C++ runtime libraries for multithreaded environments). Modified: openoffice/trunk/main/RepositoryFixes.mk openoffice/trunk/main/solenv/gbuild/gbuild.mk openoffice/trunk/main/solenv/gbuild/platform/windows.mk openoffice/trunk/main/solenv/inc/wntmsci11.mk Modified: openoffice/trunk/main/RepositoryFixes.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1486650r1=1486649r2=1486650view=diff == --- openoffice/trunk/main/RepositoryFixes.mk (original) +++ openoffice/trunk/main/RepositoryFixes.mk Mon May 27 15:58:29 2013 @@ -74,11 +74,21 @@ gb_Library_FILENAMES := $(patsubst xml2: gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) + +ifeq ($(USE_SYSTEM_STL),YES) +ifeq ($(gb_PRODUCT),$(true)) +gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) +else +gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES)) +endif +else ifeq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES)) else gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES)) endif +endif + gb_Library_NOILIBFILENAMES:=\ icule \ icuuc \ @@ -124,11 +134,21 @@ gb_Library_FILENAMES := $(patsubst xslt: gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) + +ifeq ($(USE_SYSTEM_STL),YES) +ifeq ($(gb_PRODUCT),$(true)) +gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) +else +gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES)) +endif +else ifeq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES)) else gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES)) endif +endif + gb_Library_NOILIBFILENAMES:=\ advapi32 \ gdi32 \ Modified: openoffice/trunk/main/solenv/gbuild/gbuild.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/gbuild.mk?rev=1486650r1=1486649r2=1486650view=diff == --- openoffice/trunk/main/solenv/gbuild/gbuild.mk (original) +++ openoffice/trunk/main/solenv/gbuild/gbuild.mk Mon May 27 15:58:29 2013 @@ -157,13 +157,17 @@ gb_GLOBALDEFS := \ -DENABLE_LAYOUT=0 \ -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \ -DSOLAR_JAVA \ - -DSTLPORT_VERSION=$(STLPORT_VER) \ -DSUPD=$(UPD) \ -DVCL \ $(gb_OSDEFS) \ $(gb_COMPILERDEFS) \ $(gb_CPUDEFS) \ +ifneq ($(USE_SYSTEM_STL),YES) +gb_GLOBALDEFS += \ + -DSTLPORT_VERSION=$(STLPORT_VER) +endif + ifeq ($(gb_PRODUCT),$(true)) gb_GLOBALDEFS += \ -DPRODUCT \ Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1486650r1=1486649r2=1486650view=diff == --- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Mon May 27 15:58:29 2013 @@ -479,11 +479,21 @@ gb_Library_FILENAMES :=\ gb_Library_DLLEXT := .dll gb_Library_MAJORVER := 3 gb_Library_RTEXT := MSC$(gb_Library_DLLEXT) + +ifeq ($(USE_SYSTEM_STL),YES) +ifeq ($(gb_PRODUCT),$(true)) +gb_Library_STLEXT := msvcprt.lib +else +gb_Library_STLEXT := msvcprtd.lib +endif +else ifeq ($(gb_PRODUCT),$(true)) gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT) else gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT) endif +endif + gb_Library_OOOEXT := $(gb_Library_DLLEXT) gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT) Modified: openoffice/trunk/main/solenv/inc/wntmsci11.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/wntmsci11.mk?rev=1486650r1=1486649r2=1486650view=diff == --- openoffice/trunk/main/solenv/inc/wntmsci11.mk (original) +++
svn commit: r1486651 - in /openoffice/trunk/main: chart2/source/tools/exports.flt chart2/source/view/exports.flt pyuno/source/module/pyuno.flt
Author: hdu Date: Mon May 27 16:04:49 2013 New Revision: 1486651 URL: http://svn.apache.org/r1486651 Log: #i122378# filter symbols from win's native tr1 from reexport Modified: openoffice/trunk/main/chart2/source/tools/exports.flt openoffice/trunk/main/chart2/source/view/exports.flt openoffice/trunk/main/pyuno/source/module/pyuno.flt Modified: openoffice/trunk/main/chart2/source/tools/exports.flt URL: http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/tools/exports.flt?rev=1486651r1=1486650r2=1486651view=diff == --- openoffice/trunk/main/chart2/source/tools/exports.flt (original) +++ openoffice/trunk/main/chart2/source/tools/exports.flt Mon May 27 16:04:49 2013 @@ -1,3 +1,4 @@ _real@ _TI1 _TI2 +_TI3 Modified: openoffice/trunk/main/chart2/source/view/exports.flt URL: http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/view/exports.flt?rev=1486651r1=1486650r2=1486651view=diff == --- openoffice/trunk/main/chart2/source/view/exports.flt (original) +++ openoffice/trunk/main/chart2/source/view/exports.flt Mon May 27 16:04:49 2013 @@ -2,3 +2,4 @@ lcl_ _real@ _TI1 _TI2 +_TI3 Modified: openoffice/trunk/main/pyuno/source/module/pyuno.flt URL: http://svn.apache.org/viewvc/openoffice/trunk/main/pyuno/source/module/pyuno.flt?rev=1486651r1=1486650r2=1486651view=diff == --- openoffice/trunk/main/pyuno/source/module/pyuno.flt (original) +++ openoffice/trunk/main/pyuno/source/module/pyuno.flt Mon May 27 16:04:49 2013 @@ -11,4 +11,5 @@ __CT??_R0?AVbad_alloc@std@@@8??0bad_alloc@std@@QAE@ABV01@@Z12 __CT??_R0?AVexception@@@8??0exception@@QAE@ABV0@@Z12 __CTA2?AVbad_alloc@std@@ +__CTA3? __CT??
svn commit: r1486702 - /openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
Author: paveljanik
Date: Mon May 27 20:01:41 2013
New Revision: 1486702
URL: http://svn.apache.org/r1486702
Log:
Unname unused argument to prevent compiler warnings.
Modified:
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1486702r1=1486701r2=1486702view=diff
==
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx Mon May
27 20:01:41 2013
@@ -312,7 +312,7 @@ void TextPropertyPanel::HandleContextCha
void TextPropertyPanel::UpdateFontColorToolbox (
-const ::sfx2::sidebar::EnumContext aContext)
+const ::sfx2::sidebar::EnumContext /* aContext */)
{
bool bIsWriterFontColor (false);
if (maContext.GetApplication_DI() ==
sfx2::sidebar::EnumContext::Application_WriterVariants)
[CONF] Apache OpenOffice Community *DRAFT* Distribution FAQ
Space: Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Page: *DRAFT* Distribution FAQ (https://cwiki.apache.org/confluence/display/OOOUSERS/*DRAFT*+Distribution+FAQ) Comment: https://cwiki.apache.org/confluence/display/OOOUSERS/*DRAFT*+Distribution+FAQ?focusedCommentId=31823049#comment-31823049 Comment added by Alphonso Whitfield III: - If I create templates AOO-4 can I call the templates company name-Office Tools Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
