Author: jani
Date: Sat Nov 23 00:57:33 2013
New Revision: 1544725
URL: http://svn.apache.org/r1544725
Log:
failed merge from trunk
Added:
openoffice/branches/capstone2013/main/winaccessibility/inc/
openoffice/branches/capstone2013/main/winaccessibility/inc/AccComponentEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccContainerEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccDescendantManagerEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccDialogEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccFrameEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccListEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccMenuEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccObject.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccObjectContainerEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccObjectManagerAgent.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccObjectWinManager.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccParagraphEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccResource.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccTableEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccTextComponentEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccTopWindowListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccTreeEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/AccWindowEventListener.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/ResIDGenerator.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/UAccCOM2.h
openoffice/branches/capstone2013/main/winaccessibility/inc/accHelper.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/act.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/g_msacc.hxx
openoffice/branches/capstone2013/main/winaccessibility/inc/unomsaaevent.hxx
openoffice/branches/capstone2013/main/winaccessibility/prj/
openoffice/branches/capstone2013/main/winaccessibility/prj/build.lst
openoffice/branches/capstone2013/main/winaccessibility/prj/d.lst
openoffice/branches/capstone2013/main/winaccessibility/source/
Modified:
openoffice/branches/capstone2013/main/ (props changed)
openoffice/branches/capstone2013/main/accessibility/source/extended/accessiblelistboxentry.cxx
openoffice/branches/capstone2013/main/autodoc/source/ary/cpp/namechain.cxx
openoffice/branches/capstone2013/main/autodoc/source/display/html/easywri.cxx
openoffice/branches/capstone2013/main/autodoc/source/display/inc/toolkit/outputstack.hxx
openoffice/branches/capstone2013/main/autodoc/source/parser/cpp/sownstck.hxx
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/distrib.cxx
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_excp.cxx
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_iface.cxx
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_servi.cxx
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_singl.cxx
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_struc.cxx
openoffice/branches/capstone2013/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
openoffice/branches/capstone2013/main/editeng/source/misc/splwrap.cxx
openoffice/branches/capstone2013/main/instsetoo_native/util/openoffice.lst
openoffice/branches/capstone2013/main/solenv/bin/make_installer.pl
openoffice/branches/capstone2013/main/solenv/bin/modules/installer/globals.pm
openoffice/branches/capstone2013/main/solenv/bin/modules/installer/scriptitems.pm
openoffice/branches/capstone2013/main/solenv/bin/modules/installer/windows/directory.pm
openoffice/branches/capstone2013/main/solenv/bin/modules/installer/windows/property.pm
openoffice/branches/capstone2013/main/solenv/bin/modules/installer/ziplist.pm
openoffice/branches/capstone2013/main/sw/source/core/doc/doclay.cxx
openoffice/branches/capstone2013/main/tools/source/generic/color.cxx
Propchange: openoffice/branches/capstone2013/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 23 00:57:33 2013
@@ -0,0 +1,3 @@
+/openoffice/branches/AOO400/main:1503684
+/openoffice/branches/ia2/main:1417739-1541842
+/openoffice/trunk/main:1531526-1544710
Modified:
openoffice/branches/capstone2013/main/accessibility/source/extended/accessiblelistboxentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/extended/accessiblelistboxentry.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/accessibility/source/extended/accessiblelistboxentry.cxx
(original)
+++
openoffice/branches/capstone2013/main/accessibility/source/extended/accessiblelistboxentry.cxx
Sat Nov 23 00:57:33 2013
@@ -1190,7 +1190,7 @@ namespace accessibility
SvLBoxEntry* pEntry = pBox->GetEntryFromPath(
m_aEntryPath );
if ( pEntry )
{
- sal_Int32 nValue, nValueMin, nValueMax;
+ sal_Int32 nValue(0), nValueMin(0), nValueMax(0);
aNumber >>= nValue;
getMinimumValue() >>= nValueMin;
getMaximumValue() >>= nValueMax;
Modified:
openoffice/branches/capstone2013/main/autodoc/source/ary/cpp/namechain.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/ary/cpp/namechain.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/autodoc/source/ary/cpp/namechain.cxx
(original)
+++ openoffice/branches/capstone2013/main/autodoc/source/ary/cpp/namechain.cxx
Sat Nov 23 00:57:33 2013
@@ -129,7 +129,7 @@ NameChain::Add_Segment( const char * i_s
List_TplParameter &
NameChain::Templatize_LastSegment()
{
- csv_assert( aSegments.size() > 0 );
+ csv_assert( ! aSegments.empty() );
return aSegments.back().AddTemplate();
}
@@ -158,7 +158,7 @@ NameChain::Compare( const NameChain & i_
const String &
NameChain::LastSegment() const
{
- if ( aSegments.size() > 0 )
+ if ( ! aSegments.empty() )
return aSegments.back().Name();
return String::Null_();
}
Modified:
openoffice/branches/capstone2013/main/autodoc/source/display/html/easywri.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/display/html/easywri.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/display/html/easywri.cxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/display/html/easywri.cxx
Sat Nov 23 00:57:33 2013
@@ -53,7 +53,7 @@ EasyWriter::Finish_OutputNode()
csi::xml::Element &
EasyWriter::Out()
{
- csv_assert( aCurDestination.size() > 0);
+ csv_assert( ! aCurDestination.empty() );
return *aCurDestination.top();
}
Modified:
openoffice/branches/capstone2013/main/autodoc/source/display/inc/toolkit/outputstack.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/display/inc/toolkit/outputstack.hxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/display/inc/toolkit/outputstack.hxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/display/inc/toolkit/outputstack.hxx
Sat Nov 23 00:57:33 2013
@@ -57,7 +57,7 @@ class OutputStack
inline csi::xml::Element &
OutputStack::Out() const
{
- csv_assert( aCurDestination.size() > 0 );
+ csv_assert( ! aCurDestination.empty() );
return *aCurDestination.top();
}
Modified:
openoffice/branches/capstone2013/main/autodoc/source/parser/cpp/sownstck.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/parser/cpp/sownstck.hxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/parser/cpp/sownstck.hxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/parser/cpp/sownstck.hxx
Sat Nov 23 00:57:33 2013
@@ -113,7 +113,7 @@ inline ary::cpp::Namespace &
ContextForAry::
S_OwnerStack::CurNamespace() const
{
- csv_assert( aStack_Namespaces.size() > 0 );
+ csv_assert( ! aStack_Namespaces.empty() );
return *aStack_Namespaces.top();
}
@@ -204,7 +204,7 @@ inline void
ContextForAry::
S_OwnerStack::SetCurProtection( ary::cpp::E_Protection i_eProtection )
{
- csv_assert( aStack_Classes.size() > 0 );
+ csv_assert( ! aStack_Classes.empty() );
aStack_Classes.top().second = i_eProtection;
}
Modified:
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/distrib.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/distrib.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/distrib.cxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/distrib.cxx
Sat Nov 23 00:57:33 2013
@@ -129,7 +129,7 @@ if (DEBUG_ShowTokens())
UnoIDL_PE &
TokenDistributor::ProcessingData::CurEnvironment() const
{
- csv_assert(aEnvironments.size() > 0);
+ csv_assert(!aEnvironments.empty());
csv_assert(aEnvironments.back().first != 0);
return *aEnvironments.back().first;
Modified:
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_excp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_excp.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_excp.cxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_excp.cxx
Sat Nov 23 00:57:33 2013
@@ -83,7 +83,7 @@ PE_Exception::TransferData()
{
if (NOT Work().bIsPreDeclaration)
{
- csv_assert(Work().sData_Name.size() > 0);
+ csv_assert(! Work().sData_Name.empty());
csv_assert(Work().nCurStruct.IsValid());
}
Stati().pCurStatus = &Stati().aNone;
Modified:
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_iface.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_iface.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_iface.cxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_iface.cxx
Sat Nov 23 00:57:33 2013
@@ -395,7 +395,7 @@ PE_Interface::TransferData()
{
if (NOT bIsPreDeclaration)
{
- csv_assert(sData_Name.size() > 0);
+ csv_assert(!sData_Name.empty());
csv_assert(nCurInterface.IsValid());
}
else
Modified:
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_servi.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_servi.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_servi.cxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_servi.cxx
Sat Nov 23 00:57:33 2013
@@ -304,7 +304,7 @@ PE_Service::TransferData()
{
if (NOT bIsPreDeclaration)
{
- csv_assert(sData_Name.size() > 0);
+ csv_assert(! sData_Name.empty());
csv_assert( (pCurService != 0) != (pCurSiService != 0) );
}
Modified:
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_singl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_singl.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_singl.cxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_singl.cxx
Sat Nov 23 00:57:33 2013
@@ -225,7 +225,7 @@ PE_Singleton::TransferData()
{
if (NOT bIsPreDeclaration)
{
- csv_assert(sData_Name.size() > 0);
+ csv_assert(! sData_Name.empty());
csv_assert( (pCurSingleton != 0) != (pCurSiSingleton != 0) );
}
Modified:
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_struc.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_struc.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_struc.cxx
(original)
+++
openoffice/branches/capstone2013/main/autodoc/source/parser_i/idl/pe_struc.cxx
Sat Nov 23 00:57:33 2013
@@ -82,7 +82,7 @@ PE_Struct::TransferData()
{
if (NOT Work().bIsPreDeclaration)
{
- csv_assert(Work().sData_Name.size() > 0);
+ csv_assert(! Work().sData_Name.empty());
csv_assert(Work().nCurStruct.IsValid());
}
Stati().pCurStatus = &Stati().aNone;
Modified:
openoffice/branches/capstone2013/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
---
openoffice/branches/capstone2013/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
(original)
+++
openoffice/branches/capstone2013/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
Sat Nov 23 00:57:33 2013
@@ -1782,7 +1782,7 @@ namespace accessibility
return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
}
//IAccessibility2 Implementation 2009-----
- void AccessibleEditableTextPara::_correctValues( const sal_Int32 nIndex,
+ void AccessibleEditableTextPara::_correctValues( const sal_Int32 /*
nIndex */,
uno::Sequence< PropertyValue >& rValues)
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
Modified: openoffice/branches/capstone2013/main/editeng/source/misc/splwrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/source/misc/splwrap.cxx?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/editeng/source/misc/splwrap.cxx
(original)
+++ openoffice/branches/capstone2013/main/editeng/source/misc/splwrap.cxx Sat
Nov 23 00:57:33 2013
@@ -164,13 +164,13 @@ SvxSpellWrapper::SvxSpellWrapper( Window
pWin ( pWn ),
xSpell ( xSpellChecker ),
+ mpTextObj( NULL),
bOtherCntnt ( bOther ),
bDialog ( sal_False ),
bHyphen ( sal_False ),
bAuto ( sal_False ),
bStartChk ( bOther ),
bRevAllowed ( bRevAllow ),
- mpTextObj( NULL),
bAllRight ( bIsAllRight )
{
Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() );
@@ -190,6 +190,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window
const sal_Bool bStart, const sal_Bool bOther ) :
pWin ( pWn ),
xHyph ( xHyphenator ),
+ mpTextObj( NULL),
bOtherCntnt ( bOther ),
bDialog ( sal_False ),
bHyphen ( sal_False ),
@@ -199,7 +200,6 @@ SvxSpellWrapper::SvxSpellWrapper( Window
bEndDone ( bReverse && bStart && !bOther ),
bStartChk ( bOther ),
bRevAllowed ( sal_False ),
- mpTextObj( NULL),
bAllRight ( sal_True )
{
}
Modified:
openoffice/branches/capstone2013/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/instsetoo_native/util/openoffice.lst?rev=1544725&r1=1544724&r2=1544725&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/instsetoo_native/util/openoffice.lst
(original)
+++ openoffice/branches/capstone2013/main/instsetoo_native/util/openoffice.lst
Sat Nov 23 00:57:33 2013
@@ -239,48 +239,6 @@ Apache_OpenOffice_Dev
}
}
-URE
-{
- Settings
- {
- downloadname URE_{productversion}_{os}_install_{languages}
- variables
- {
- FULLPRODUCTNAME URE
- PRODUCTNAME URE
- PRODUCTVERSION 4.1.0
- PACKAGEVERSION 4.1
- PACKAGEREVISION 1
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- LICENSENAME ALv2
- SETSTATICPATH 1
- NOVERSIONINDIRNAME 1
- PCPFILENAME ure.pcp
- POOLPRODUCT 0
- GLOBALFILEGID gid_File_Dl_Cppu
- DOWNLOADBANNER urebanner.bmp
- DOWNLOADBITMAP urebitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- DONTUSESTARTMENUFOLDER 1
- RELATIVE_PATHES_IN_DDF 1
- NOLANGUAGESELECTIONPRODUCT 1
- AOODOWNLOADNAMEPREFIX Apache_OpenOffice-URE
- STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
- STARTCENTER_INFO_URL http://www.openoffice.org
- STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
- STARTCENTER_LAYOUT_STYLE 0
- ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,version.lst
- PACKAGEMAP package_names_ext.txt
- DICT_REPO_URL http://extensions.openoffice.org/dictionaries
- }
- active 1
- compression 5
- script ure
- include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS
- }
-}
Apache_OpenOffice_SDK
{
@@ -307,7 +265,6 @@ Apache_OpenOffice_SDK
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
- NOVERSIONINDIRNAME 0
NOSPACEINDIRECTORYNAME 1
NOLANGUAGESELECTIONPRODUCT 1
CHANGETARGETDIR 1
@@ -362,7 +319,6 @@ Apache_OpenOffice_Dev_SDK
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
- NOVERSIONINDIRNAME 0
NOSPACEINDIRECTORYNAME 1
NOLANGUAGESELECTIONPRODUCT 1
CHANGETARGETDIR 1
