openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1550072 [1/9] - in /openoffice/branches/rejuvenate01: ./ main/accessibility/source/extended/ main/accessibility/source/standard/ main/basic/source/runtime/ main/bridges/prj/ main/chart2/source/controller/dialogs/ main/cui/source/dialogs/ m...
Date Wed, 11 Dec 2013 08:49:18 GMT
Author: hdu
Date: Wed Dec 11 08:49:16 2013
New Revision: 1550072

URL: http://svn.apache.org/r1550072
Log:
updated "rejuvenate" branch to trunk (as of 2013/12/11, r1550058)

Added:
    openoffice/branches/rejuvenate01/main/solenv/bin/patch_tool.pl
      - copied unchanged from r1550068, openoffice/trunk/main/solenv/bin/patch_tool.pl
Modified:
    openoffice/branches/rejuvenate01/   (props changed)
    openoffice/branches/rejuvenate01/main/accessibility/source/extended/accessiblelistboxentry.cxx
    openoffice/branches/rejuvenate01/main/accessibility/source/extended/textwindowaccessibility.cxx
    openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx
    openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblelist.cxx
    openoffice/branches/rejuvenate01/main/basic/source/runtime/methods.cxx
    openoffice/branches/rejuvenate01/main/bridges/prj/build.lst
    openoffice/branches/rejuvenate01/main/chart2/source/controller/dialogs/tp_DataSource.cxx
    openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuigrfflt.cxx
    openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unofored.hxx
    openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unoforou.hxx
    openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unotext.hxx
    openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
    openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx
    openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit.hxx
    openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit3.cxx
    openoffice/branches/rejuvenate01/main/editeng/source/uno/unoedprx.cxx
    openoffice/branches/rejuvenate01/main/extensions/source/ole/oleobjw.cxx
    openoffice/branches/rejuvenate01/main/formula/source/ui/dlg/formdlgs.src
    openoffice/branches/rejuvenate01/main/instsetoo_native/data/releases.xml
    openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk
    openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx
    openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleText.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/inc/AccessibleDocument.hxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/content.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin5.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/output.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/preview.cxx
    openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun2.cxx
    openoffice/branches/rejuvenate01/main/sd/source/filter/ppt/pptin.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/func/fuediglu.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/view/sdwindow.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/view/viewfrm.cxx
    openoffice/branches/rejuvenate01/main/solenv/bin/make_installer.pl
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/control.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/converter.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/globals.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/languages.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/logger.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/packagepool.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/parameter.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/FileSequenceList.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/InstallationSet.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/Msi.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/MsiRow.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/MsiTable.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/ReleasesList.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/Tools.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/patch/Version.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/pathanalyzer.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/scppatchsoname.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/scpzipfiles.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/scriptitems.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/setupscript.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/systemactions.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/assembly.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/component.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/directory.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/featurecomponent.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/file.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/idtglobal.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/inifile.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/msiglobal.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/registry.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/worker.pm
    openoffice/branches/rejuvenate01/main/solenv/bin/release_prepare.pl
    openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk
    openoffice/branches/rejuvenate01/main/solenv/inc/tg_app.mk
    openoffice/branches/rejuvenate01/main/svl/source/items/whassert.hxx
    openoffice/branches/rejuvenate01/main/svtools/source/brwbox/brwbox3.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/brwbox/editbrowsebox.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/contnr/svtreebx.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/control/valueacc.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/control/valueset.cxx
    openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleGraphicShape.cxx
    openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleShape.cxx
    openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleTextHelper.cxx
    openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx
    openoffice/branches/rejuvenate01/main/svx/source/accessibility/charmapacc.cxx
    openoffice/branches/rejuvenate01/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/access/acccontext.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.cxx
    openoffice/branches/rejuvenate01/main/sw/source/core/crsr/swcrsr.cxx
    openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxsystemdependentwindow.cxx
    openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtopwindow.cxx
    openoffice/branches/rejuvenate01/main/tools/inc/tools/debug.hxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/app/vclnsapp.mm
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salnativewidgets.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salvd.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salmenu.cxx
    openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salobj.cxx
    openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salframe.h
    openoffice/branches/rejuvenate01/main/vcl/inc/vcl/msgbox.hxx
    openoffice/branches/rejuvenate01/main/vcl/inc/vcl/sysdata.hxx
    openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/window/msgbox.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/window/syschild.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/window/window.cxx
    openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
    openoffice/branches/rejuvenate01/main/xmlhelp/source/com/sun/star/help/HelpSearch.java
    openoffice/branches/rejuvenate01/test/   (props changed)
    openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl/   (props changed)

Propchange: openoffice/branches/rejuvenate01/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1546408-1550068

Modified: openoffice/branches/rejuvenate01/main/accessibility/source/extended/accessiblelistboxentry.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/source/extended/accessiblelistboxentry.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/source/extended/accessiblelistboxentry.cxx (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/source/extended/accessiblelistboxentry.cxx Wed Dec 11 08:49:16 2013
@@ -908,10 +908,7 @@ namespace accessibility
 		::osl::MutexGuard aGuard( m_aMutex );
 
 		EnsureIsAlive();
-//		SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
-//		SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
-
-		SvLBoxEntry* pEntry =GetRealChild(nChildIndex);
+		SvLBoxEntry* pEntry = GetRealChild(nChildIndex);
 		if ( !pEntry )
 			throw IndexOutOfBoundsException();
 

Modified: openoffice/branches/rejuvenate01/main/accessibility/source/extended/textwindowaccessibility.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/source/extended/textwindowaccessibility.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/source/extended/textwindowaccessibility.cxx (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/source/extended/textwindowaccessibility.cxx Wed Dec 11 08:49:16 2013
@@ -1533,20 +1533,7 @@ Document::retrieveParagraphRelationSet( 
 
 void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
-	switch ( rVclWindowEvent.GetId() )
-	{
-		case VCLEVENT_WINDOW_GETFOCUS:
-		case VCLEVENT_WINDOW_LOSEFOCUS:
-		{
-			// #107179# if our parent is a compound control (e.g. MultiLineEdit), 
-			// suppress the window focus events here
-			//if ( !m_bCompoundControlChild )
-				VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
-		}
-		break;
-		default:
-			VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
-	}
+	VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
 }
 
 // virtual

Modified: openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx Wed Dec 11 08:49:16 2013
@@ -238,7 +238,6 @@ sal_Bool VCLXAccessibleCheckBox::doAcces
 	if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-	//	return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
 	if(IsChecked())
 		return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_UNCHECK ) );
 	else

Modified: openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblelist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblelist.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblelist.cxx (original)
+++ openoffice/branches/rejuvenate01/main/accessibility/source/standard/vclxaccessiblelist.cxx Wed Dec 11 08:49:16 2013
@@ -426,12 +426,7 @@ void VCLXAccessibleList::ProcessWindowEv
 		case VCLEVENT_COMBOBOX_SCROLLED:
 			UpdateEntryRange_Impl();
 			break;
-		/*
-		case VCLEVENT_LISTBOX_SELECT:
-			if ( !m_bDisableProcessEvent )
-				UpdateSelection_Impl();
-			break;
-		*/
+
 		// The selection events VCLEVENT_COMBOBOX_SELECT and
 		// VCLEVENT_COMBOBOX_DESELECT are not handled here because here we
 		// have no access to the edit field.  Its text is necessary to
@@ -561,15 +556,7 @@ Reference<XAccessible> VCLXAccessibleLis
 	{
 		xChild = m_aAccessibleChildren[nPos];
 		// check if position is empty and can be used else we have to adjust all entries behind this
-		if ( xChild.is() )
-		{
-			/*	
-			ListItems::iterator aIter = m_aAccessibleChildren.begin() + nPos;
-            ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::IncrementIndexInParent);
-			adjustEntriesIndexInParent(	aIter, aTemp);
-			*/
-		}
-		else
+		if ( !xChild.is() )
 		{
 			xChild = new VCLXAccessibleListItem(m_pListBoxHelper, i, this);
 			m_aAccessibleChildren[nPos] = xChild;
@@ -602,26 +589,6 @@ Reference<XAccessible> VCLXAccessibleLis
 
 void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex)
 {
-	/*
-    if ( !bItemInserted )
-	{
-		if ( nIndex == -1 ) // special handling here
-		{
-			clearItems();
-		}
-		else
-		{
-			if ( nIndex >= 0 && static_cast<sal_uInt16>(nIndex) < m_aAccessibleChildren.size() )
-			{
-				ListItems::iterator aIter = m_aAccessibleChildren.erase(m_aAccessibleChildren.begin()+nIndex);
-            ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::DecrementIndexInParent);
-				adjustEntriesIndexInParent(	aIter, aTemp );
-			}
-		}
-	}
-	else
-		getAccessibleChild(nIndex);
-	*/	
 	clearItems();	
     NotifyAccessibleEvent (
         AccessibleEventId::INVALIDATE_ALL_CHILDREN,
@@ -1070,11 +1037,8 @@ awt::Rectangle VCLXAccessibleList::implG
 			if ( pBox )
 			{
 				Size aSize = pBox->GetSubEdit()->GetSizePixel();
-				//aBounds.X += aSize.Height();
-				//aBounds.Y += aSize.Width();
 				aBounds.Y += aSize.Height();
 				aBounds.Height -= aSize.Height();
-				//aBounds.Width  -= aSize.Width();
 			}
 		}
 	}
@@ -1102,8 +1066,6 @@ awt::Point VCLXAccessibleList::getLocati
 			ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
 			if ( pBox )
 			{
-				//aPos.X += pBox->GetSubEdit()->GetSizePixel().Height();
-				//aPos.Y += pBox->GetSubEdit()->GetSizePixel().Width();
 				aPos.Y += pBox->GetSubEdit()->GetSizePixel().Height();
 			}
 		}

Modified: openoffice/branches/rejuvenate01/main/basic/source/runtime/methods.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/basic/source/runtime/methods.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/branches/rejuvenate01/main/basic/source/runtime/methods.cxx Wed Dec 11 08:49:16 2013
@@ -4311,7 +4311,7 @@ RTLFUNC(MsgBox)
 			pBox = new WarningBox( pParent, nWinBits, aMsg );
 			break;
 		case 64:
-			pBox = new InfoBox( pParent, aMsg );
+			pBox = new InfoBox( pParent, nWinBits, aMsg );
 			break;
 		default:
 			pBox = new MessBox( pParent, nWinBits, aTitle, aMsg );

Modified: openoffice/branches/rejuvenate01/main/bridges/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/prj/build.lst?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/bridges/prj/build.lst (original)
+++ openoffice/branches/rejuvenate01/main/bridges/prj/build.lst Wed Dec 11 08:49:16 2013
@@ -22,7 +22,7 @@ br	bridges\source\cpp_uno\gcc3_linux_hpp
 br	bridges\source\cpp_uno\gcc3_linux_alpha		nmake	-	u	br_gcc3ll br_unotypes NULL
 br	bridges\source\cpp_uno\gcc3_macosx_intel			nmake	-	u	br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_macosx_powerpc			nmake	-	u	br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
-br	bridges\source\cpp_uno\s5abi_macosx_x86-64			nmake	-	u	br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL
+br	bridges\source\cpp_uno\s5abi_macosx_x86-64			nmake	-	u	br_s5abimacoxx br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\cc50_solaris_sparc			nmake	-	u	br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
 br  bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64 br_unotypes br_cppuno_shared br_inc NULL
 br	bridges\source\cpp_uno\cc50_solaris_intel			nmake	-	u	br_cc50soli br_unotypes br_cppuno_shared br_inc NULL

Modified: openoffice/branches/rejuvenate01/main/chart2/source/controller/dialogs/tp_DataSource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/chart2/source/controller/dialogs/tp_DataSource.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/chart2/source/controller/dialogs/tp_DataSource.cxx (original)
+++ openoffice/branches/rejuvenate01/main/chart2/source/controller/dialogs/tp_DataSource.cxx Wed Dec 11 08:49:16 2013
@@ -69,10 +69,6 @@ const OUString lcl_aLabelRole( RTL_CONST
 String lcl_GetRoleLBEntry(
     const OUString & rRole, const OUString & rRange )
 {
-    //String aEntry( rRole );
-    //aEntry += '\t';
-    //aEntry += String(
-    //    ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
     String aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
     aEntry += '\t';
     aEntry += String( rRange );

Modified: openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuigrfflt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuigrfflt.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuigrfflt.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/dialogs/cuigrfflt.cxx Wed Dec 11 08:49:16 2013
@@ -534,8 +534,6 @@ GraphicFilterSolarize::GraphicFilterSola
 
 	maCbxInvert.Check( bInvert );
 	maCbxInvert.SetToggleHdl( GetModifyHdl() );
-
-	// maMtrThreshold.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
@@ -594,8 +592,6 @@ GraphicFilterSepia::GraphicFilterSepia( 
 
 	maMtrSepia.SetValue( nSepiaPercent );
 	maMtrSepia.SetModifyHdl( GetModifyHdl() );
-
-	// maMtrSepia.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
@@ -646,8 +642,6 @@ GraphicFilterPoster::GraphicFilterPoster
     maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
 	maNumPoster.SetValue( nPosterCount );
 	maNumPoster.SetModifyHdl( GetModifyHdl() );
-
-	// maNumPoster.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------

Modified: openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unofored.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unofored.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unofored.hxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unofored.hxx Wed Dec 11 08:49:16 2013
@@ -72,7 +72,6 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;

Modified: openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unoforou.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unoforou.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unoforou.hxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unoforou.hxx Wed Dec 11 08:49:16 2013
@@ -93,7 +93,6 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;

Modified: openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unotext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unotext.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unotext.hxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/inc/editeng/unotext.hxx Wed Dec 11 08:49:16 2013
@@ -218,7 +218,6 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;

Modified: openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx Wed Dec 11 08:49:16 2013
@@ -815,7 +815,6 @@ namespace accessibility
         // must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
         if ( rType == ::getCppuType((uno::Reference< XAccessibleText > *)0) )
         {
-			//	uno::Reference< XAccessibleText > aAccText = this;
             uno::Reference< XAccessibleText > aAccText = static_cast< XAccessibleEditableText * >(this);
             aRet <<= aAccText;
         }
@@ -2509,7 +2508,6 @@ namespace accessibility
             if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible )
                         nBulletLen = aBulletInfo.aText.Len();
             ESelection aSelection = MakeSelection (nStartIndex + nBulletLen, nEndIndex + nBulletLen);
-            //if( !rCacheTF.IsEditable( MakeSelection(nStartIndex, nEndIndex) ) )
             if( !rCacheTF.IsEditable( aSelection ) )
                 return sal_False; // non-editable area selected
 
@@ -3007,7 +3005,7 @@ namespace accessibility
 //        const sal_uInt16 nEEIndex = aIndex.GetEEIndex();
 
         const sal_uInt16 nEEIndex = rT.CalcEditEngineIndex( nPara, nCharIndex );
-        sal_Int32 nHLIndex = 0;
+        sal_Int32 nHLIndex = -1; //i123620
         sal_uInt16 nHyperLink = 0;
         sal_uInt16 nFields = rT.GetFieldCount( nPara );
         for ( sal_uInt16 n = 0; n < nFields; n++ )

Modified: openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx Wed Dec 11 08:49:16 2013
@@ -892,7 +892,6 @@ sal_Unicode cNewLine(0x0a);
         {
 			//we don't return the string directly now for that we have to do some further process for "\n"
 			aRes = mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
-            //return mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
         }
         else
         {

Modified: openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit.hxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit.hxx Wed Dec 11 08:49:16 2013
@@ -480,7 +480,6 @@ private:
 	sal_Bool			bInSelection;
 	sal_Bool			bIsInUndo;
 	sal_Bool			bUpdate;
-	// IAccessible2 migration fix
 	sal_Bool			bUpdateForAcc;
 	sal_Bool			bUndoEnabled;
 	sal_Bool			bOwnerOfRefDev;
@@ -715,7 +714,6 @@ public:
 
 	void					SetUpdateMode( sal_Bool bUp, EditView* pCurView = 0, sal_Bool bForceUpdate = sal_False );
 	sal_Bool				GetUpdateMode()	const	{ return bUpdate; }
-	// IAccessible2 migration fix
 	void					SetUpdateModeForAcc( sal_Bool bUp);
 	sal_Bool				GetUpdateModeForAcc();
 

Modified: openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit3.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit3.cxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit3.cxx Wed Dec 11 08:49:16 2013
@@ -368,8 +368,6 @@ void ImpEditEngine::FormatFullDoc()
 
 void ImpEditEngine::FormatDoc()
 {
-	// IAccessible2 migration fix
-	//if ( !GetUpdateMode() || IsFormatting() )
 	if ( !GetUpdateMode() || IsFormatting() || !GetUpdateModeForAcc())
 		return;
 
@@ -3862,16 +3860,16 @@ EditPaM ImpEditEngine::ConnectContents( 
 	DBG_ASSERT( IsInUndo(), "ConnectContent nur fuer Undo()!" );
 	return ImpConnectParagraphs( pLeftNode, pRightNode, bBackward );
 }
-//IAccessible2 migration fix
+
 void ImpEditEngine::SetUpdateModeForAcc( sal_Bool bUp)
 {
 	bUpdateForAcc = bUp;
 }
+
 sal_Bool ImpEditEngine::GetUpdateModeForAcc()
 {
 	return bUpdateForAcc;
 }
-//End
 
 void ImpEditEngine::SetUpdateMode( sal_Bool bUp, EditView* pCurView, sal_Bool bForceUpdate )
 {

Modified: openoffice/branches/rejuvenate01/main/editeng/source/uno/unoedprx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/source/uno/unoedprx.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/source/uno/unoedprx.cxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/source/uno/unoedprx.cxx Wed Dec 11 08:49:16 2013
@@ -508,22 +508,6 @@ String SvxAccessibleTextAdapter::GetText
     EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
     EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
 
-	// MT: This was done in OOo, commented out in IA2 CWS...
-    /*
-    if( aStartIndex.InBullet() )
-    {
-        // prepend leading bullet
-        String sBullet = aBulletInfo1.aText;
-
-        DBG_ASSERT(aStartIndex.GetBulletOffset() >= 0 &&
-                   aStartIndex.GetBulletOffset() <= USHRT_MAX,
-                   "SvxAccessibleTextIndex::GetText: index value overflow");
-
-        sBullet.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetBulletOffset()) );
-
-        sBullet += sStr;
-        sStr = sBullet;
-    }*/
     if( aEndIndex.InBullet() )
     {
         // append trailing bullet

Modified: openoffice/branches/rejuvenate01/main/extensions/source/ole/oleobjw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/ole/oleobjw.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions/source/ole/oleobjw.cxx (original)
+++ openoffice/branches/rejuvenate01/main/extensions/source/ole/oleobjw.cxx Wed Dec 11 08:49:16 2013
@@ -2333,6 +2333,50 @@ void IUnknownWrapper_Impl::getPropDesc(c
    //else no entry for sFuncName, pFuncDesc will not be filled in    
 }
 
+VARTYPE lcl_getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType )
+{
+    VARTYPE _type( VT_NULL );
+    if ( pTypeInfo )
+    {
+        CComPtr<ITypeInfo> spRefInfo;
+        pTypeInfo->GetRefTypeInfo( nHrefType, &spRefInfo.p );
+        if ( spRefInfo )
+        {
+            TypeAttr attr( spRefInfo );
+            spRefInfo->GetTypeAttr( &attr );
+            if ( attr->typekind == TKIND_ENUM )
+            {
+                // We use the type of the first enum value.
+                if ( attr->cVars == 0 )
+                {
+                    throw BridgeRuntimeError(OUSTR("[automation bridge] Could not obtain type description"));
+                }
+                VarDesc var( spRefInfo );
+                spRefInfo->GetVarDesc( 0, &var );
+                _type = var->lpvarValue->vt;
+            }
+            else if ( attr->typekind == TKIND_INTERFACE )
+            {
+                _type = VT_UNKNOWN;
+            }
+            else if ( attr->typekind == TKIND_DISPATCH )
+            {
+                _type = VT_DISPATCH;
+            }
+            else if ( attr->typekind == TKIND_ALIAS )
+            {
+                // TKIND_ALIAS is a type that is an alias for another type. So get that alias type.
+                _type = lcl_getUserDefinedElementType( pTypeInfo, attr->tdescAlias.hreftype );
+            }
+            else
+            {
+                throw BridgeRuntimeError( OUSTR("[automation bridge] Unhandled user defined type.") );
+            }
+        }
+    }
+    return _type;
+}
+
 VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
 {
 	VARTYPE _type( VT_NULL );
@@ -2350,38 +2394,7 @@ VARTYPE IUnknownWrapper_Impl::getElement
 	else if (desc->vt == VT_USERDEFINED)
 	{
 		ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance
-		CComPtr<ITypeInfo>	spRefInfo;
-		thisInfo->GetRefTypeInfo(desc->hreftype, & spRefInfo.p);
-		if (spRefInfo)
-		{
-			TypeAttr  attr(spRefInfo);
-			spRefInfo->GetTypeAttr( & attr);
-			if (attr->typekind == TKIND_ENUM)
-			{
-				//We use the type of the first enum value.
-				if (attr->cVars == 0)
-				{
-					throw BridgeRuntimeError(OUSTR("[automation bridge] Could "
-						"not obtain type description"));
-				}
-				VarDesc var(spRefInfo);
-				spRefInfo->GetVarDesc(0, & var);
-				_type = var->lpvarValue->vt; 
-			}
-			else if (attr->typekind == TKIND_INTERFACE)
-			{
-				_type = VT_UNKNOWN;
-			}
-			else if (attr->typekind == TKIND_DISPATCH)
-			{
-				_type = VT_DISPATCH;
-			}
-			else 
-			{
-				throw BridgeRuntimeError(OUSTR("[automation bridge] "
-					"Unhandled user defined type."));
-			}
-		}
+		_type = lcl_getUserDefinedElementType( thisInfo, desc->hreftype );
 	}
 	else
 	{

Modified: openoffice/branches/rejuvenate01/main/formula/source/ui/dlg/formdlgs.src
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/formula/source/ui/dlg/formdlgs.src?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/formula/source/ui/dlg/formdlgs.src (original)
+++ openoffice/branches/rejuvenate01/main/formula/source/ui/dlg/formdlgs.src Wed Dec 11 08:49:16 2013
@@ -225,7 +225,6 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
 	    Right = TRUE ;
 	    Text [ en-US ] = "Function result" ;
     };
-    //Window WND_RESULT
 	FixedText WND_RESULT
     {
 	    Border = TRUE ;

Modified: openoffice/branches/rejuvenate01/main/instsetoo_native/data/releases.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/instsetoo_native/data/releases.xml?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk Wed Dec 11 08:49:16 2013
@@ -19,8 +19,6 @@
 #  
 #**************************************************************
 
-
-
 PRJ=..
 PRJNAME=instsetoo_native
 TARGET=util
@@ -61,6 +59,17 @@ INSTALLDIR=$(OUT)
 
 .INCLUDE: target.mk
 
+.IF "$(FORCE2ARCHIVE)" == "TRUE"
+PKGFORMAT = archive
+.END
+.IF "$(MAKETARGETS:e)"!=""
+PKGFORMAT+=$(MAKETARGETS:e:s/.//)
+.ENDIF
+# PKGFORMAT may contain the standard package format twice at this time.
+# Provide its content with duplicates removed.
+PACKAGE_FORMATS=$(uniq $(PKGFORMAT))
+
+
 # The help target belongs after the inclusion of target.mk to not become the default target.
 help .PHONY :
 	@echo "known targets:"
@@ -74,6 +83,11 @@ help .PHONY :
 	@echo "    sdkoo"
 	@echo "    sdkoodev"
 	@echo 
+	@echo "experimental targets:"
+	@echo "    patch-create           create a patch for updating an installed office (Windows only)"
+	@echo "    patch-apply            apply a previously created patch"
+	@echo "    patch-update-releases-xml"
+	@echo 
 	@echo "Most targets (all except aoo_srcrelease and updatepack) accept suffixes"
 	@echo "    add _<language> to build a target for one language only"
 	@echo "        the default set of languages is alllangiso=$(alllangiso)"
@@ -81,9 +95,9 @@ help .PHONY :
 	@echo "        the default set of package formats is archive and PKGFORMAT=$(PKGFORMAT)"
 
 
-LOCALPYFILES= \
-    $(BIN)$/uno.py \
-	$(BIN)$/unohelper.py \
+LOCALPYFILES=			\
+	$(BIN)$/uno.py		\
+	$(BIN)$/unohelper.py	\
 	$(BIN)$/pythonloader.py \
 	$(BIN)$/pythonscript.py \
 	$(BIN)$/officehelper.py \
@@ -107,13 +121,6 @@ ALLTAR : updatepack
 .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 .ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 
-.IF "$(FORCE2ARCHIVE)" == "TRUE"
-PKGFORMAT = archive
-.END
-
-.IF "$(MAKETARGETS:e)"!=""
-PKGFORMAT+=$(MAKETARGETS:e:s/.//)
-.ENDIF			# "$(MAKETARGETS:e)"!=""
 
 # Independent of PKGFORMAT, always build a default-language openoffice product
 # also in archive format, so that tests that require an OOo installation (like
@@ -126,6 +133,20 @@ VERBOSESWITCH=-verbose
 VERBOSESWITCH=-quiet
 .ENDIF
 
+.IF "$(release:U)"=="T"
+RELEASE_SWITCH=-release
+$(foreach,i,$(alllangiso) openoffice_$i.msi) : prepare_release_build
+.ELSE
+RELEASE_SWITCH=
+.ENDIF
+
+prepare_release_build .PHONY:
+	@$(PERL) -w $(SOLARENV)$/bin$/release_prepare.pl 	\
+		--lst-file $(PRJ)$/util$/openoffice.lst 	\
+		--product-name Apache_OpenOffice		\
+		--output-path $(OUT) 				\
+		$(alllangiso)
+
 .IF "$(VERBOSE_INSTALLER)"=="TRUE"
 VERBOSESWITCH+=-log
 .ENDIF
@@ -140,21 +161,23 @@ aoo_srcrelease: $(SOLARENV)$/bin$/srcrel
 updatepack:
 	$(PERL) -w $(SOLARENV)$/bin$/packager.pl
 
+
+# The naming schema of targets is this: target_language.package
+# where 'target' is the target base name (as openoffice or sdkoo)
+#       'language' is the language name (like en-US or fr)
+#       'package' is the package format (like msi or deb)
+
 .IF "$(alllangiso)"!=""
 
+# Add dependencies of basic targets on language specific targets.
 openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-
 openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-
 openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
-
 ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
-
 ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
-
 sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
-
 sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
+patch-create: $(foreach,i,$(alllangiso) patch-create_$i)
 
 MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
 MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
@@ -166,44 +189,47 @@ MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice
 MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
 MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
 
-ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
+ADDDEPS=adddeps
+adddeps .PHONY : $(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
 
 .IF "$(OS)" == "WNT"
-ADDDEPS+=msitemplates
+adddeps : msitemplates
 .ENDIF
 
-$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
-openoffice_$(defaultlangiso).archive : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-
-.IF "$(MAKETARGETS)"!=""
-$(MAKETARGETS) : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS)"!=""
+.IF "$(LOCALPYFILES)"!=""
+local_python_files .PHONY : $(LOCALPYFILES)
+adddeps : local_python_files
+updatepack : local_python_files
+.ENDIF			# "$(LOCALPYFILES)"!=""
 
+# Add dependencies on 'adddeps' where necessary.
+$(foreach,i,$(alllangiso) openoffice_$i) : adddeps
+openoffice_$(defaultlangiso).archive : adddeps
+$(foreach,i,$(alllangiso) openofficedev_$i) : adddeps
+$(foreach,i,$(alllangiso) openofficewithjre_$i) : adddeps
+$(foreach,i,$(alllangiso) ooolanguagepack_$i) : adddeps
+$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : adddeps
+$(foreach,i,$(alllangiso) sdkoo_$i) : adddeps
+$(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
+
+# Create targets that take the package formats into account.  Together with language dependency we
+# get this transformation: target -> target_$language -> target_$language.$package
+# where $language ranges over all languages in $(alllangiso) 
+# and $package ranges over all package formats in $(PKGFORMAT)
 $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!=""
+$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) patch-create_$i) : $$@{$(PKGFORMAT:^".")}
 
 
 # This macro makes calling the make_installer.pl script a bit easier.
 # Just add -p and -msitemplate switches.
 MAKE_INSTALLER_COMMAND=					\
-	@$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl 	\
+	@$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
 		-f $(PRJ)$/util$/openoffice.lst 	\
 		-l $(subst,$(@:s/_/ /:1)_, $(@:b)) 	\
 		-u $(OUT) 				\
@@ -215,23 +241,25 @@ MAKE_INSTALLER_COMMAND=					\
 # This macro makes calling gen_update_info.pl a bit easier
 # Just add --product switches, and xml input file and redirect output.
 GEN_UPDATE_INFO_COMMAND=					\
-	@$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl		\
+	@$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl	\
 		--buildid $(BUILD)				\
 		--arch "$(RTL_ARCH)"				\
 		--os "$(RTL_OS)"				\
 		--lstfile $(PRJ)$/util$/openoffice.lst		\
 		--languages $(subst,$(@:s/_/ /:1)_, $(@:b))
 
-openoffice_%{$(PKGFORMAT:^".")} :
-	$(MAKE_INSTALLER_COMMAND) 		\
-		-p Apache_OpenOffice		\
-		-msitemplate $(MSIOFFICETEMPLATEDIR)
+#openoffice_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openoffice_$L.$P)) .PHONY :
+	$(MAKE_INSTALLER_COMMAND) 			\
+		-p Apache_OpenOffice			\
+		-msitemplate $(MSIOFFICETEMPLATEDIR)	\
+		$(RELEASE_SWITCH)
 	$(GEN_UPDATE_INFO_COMMAND)		\
 		--product Apache_OpenOffice	\
 		$(PRJ)$/util$/update.xml	\
 		> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-openoffice_%{.archive} :
+$(foreach,L,$(alllangiso) openoffice_$L.archive) :
 	$(MAKE_INSTALLER_COMMAND) 		\
 		-p Apache_OpenOffice		\
 		-msitemplate $(MSIOFFICETEMPLATEDIR)
@@ -240,12 +268,12 @@ openoffice_%{.archive} :
 		$(PRJ)$/util$/update.xml	\
 		> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-openofficewithjre_%{$(PKGFORMAT:^".")} :
+#openofficewithjre_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficewithjre_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_wJRE -msitemplate $(MSIOFFICETEMPLATEDIR)
 
-$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
-openofficedev_%{$(PKGFORMAT:^".")} :
+#openofficedev_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficedev_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND)		\
 		-p Apache_OpenOffice_Dev	\
 		-msitemplate $(MSIOFFICETEMPLATEDIR)
@@ -254,54 +282,81 @@ openofficedev_%{$(PKGFORMAT:^".")} :
 		$(PRJ)$/util$/update.xml 		\
 		> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-ooolanguagepack_%{$(PKGFORMAT:^".")} :
+#ooolanguagepack_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooolanguagepack_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND)			\
 		-p Apache_OpenOffice			\
 		-msitemplate $(MSILANGPACKTEMPLATEDIR)	\
 		-languagepack
 
-$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
+#ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooodevlanguagepack_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev -msitemplate $(MSILANGPACKTEMPLATEDIR) -languagepack
 
-$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
-sdkoo_%{$(PKGFORMAT:^".")} :
+#sdkoo_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoo_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
 
-$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
-sdkoodev_%{$(PKGFORMAT:^".")} :
+#sdkoodev_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoodev_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
 
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!=""
-
 .ELSE			# "$(alllangiso)"!=""
 openoffice:
 	@echo cannot pack nothing...
 
 .ENDIF			# "$(alllangiso)"!=""
 
-.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
-.ENDIF			# "$(LOCALPYFILES)"!=""
-
 $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
-	@$(COPY) $< $@
+	$(COPY) $< $@
 
-#$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
 $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
 	$(COPY) $< $@
 
-#$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev_nologo$/intro.zip
 $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
 	@-$(MKDIR) $(@:d)
 	$(COPY) $< $@
 
+
+.IF "$(OS)" == "WNT"
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) patch-create_$L.$P)) .PHONY :
+	@echo building $@
+	perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
+		create								\
+		--product-name Apache_OpenOffice				\
+		--output-path $(OUT)						\
+		--data-path $(PRJ)$/data					\
+		--lst-file $(PRJ)$/util$/openoffice.lst				\
+		--language $(subst,$(@:s/_/ /:1)_, $(@:b))			\
+		--package-format $(@:e:s/.//)
+patch-apply .PHONY :
+	perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
+		apply								\
+		--product-name Apache_OpenOffice				\
+		--output-path $(OUT)						\
+		--lst-file $(PRJ)$/util$/openoffice.lst				\
+		--language en-US						\
+		--package-format msi
+patch-update-releases-xml .PHONY:
+	perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
+		update-releases-xml						\
+		--product-name Apache_OpenOffice				\
+		--output-path $(OUT)						\
+		--lst-file $(PRJ)$/util$/openoffice.lst\
+		--target-version 4.0.1
+
+$(PRJ)$/data :
+	mkdir $@
+.ELSE
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) patch-create_$L.$P)) .PHONY :
+	@echo "patches can only be created on Windows at the moment"
+patch-apply .PHONY :
+	@echo "patches can only be created on Windows at the moment"
+patch-update-releases-xml .PHONY:
+	@echo "patches can only be created on Windows at the moment"
+.ENDIF
+
+
 msitemplates .PHONY: msi_template_files msi_langpack_template_files msi_sdk_template_files
 
 MSI_OFFICE_TEMPLATE_FILES=		\
@@ -460,3 +515,8 @@ $(MSISDKOOTEMPLATEDIR) $(MSISDKOOTEMPLAT
 	-$(MKDIRHIER) $@
 $(MSISDKOOTEMPLATEDIR)/% : $(MSISDKOOTEMPLATESOURCE)$/%
 	$(GNUCOPY) $< $@
+
+
+# Local Variables:
+# tab-width: 8
+# End:

Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/allocator.hxx Wed Dec 11 08:49:16 2013
@@ -167,22 +167,5 @@ inline bool operator!= (const Allocator<
 
 } /* namespace rtl */
 
-//######################################################
-/** REQUIRED BY STLPort (see stlport '_alloc.h'): 
-    Hack for compilers that do not support member 
-    template classes (e.g. MSVC 6)
-
-    @internal
-*/
-namespace _STL
-{
-    /** @internal */
-    template<class T, class U>
-    inline ::rtl::Allocator<U> & __stl_alloc_rebind (::rtl::Allocator<T> & a, U const *)
-    {
-        return (::rtl::Allocator<U>&)(a);
-    }
-}
-
 #endif /* INCLUDED_RTL_ALLOCATOR_HXX */
 

Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx Wed Dec 11 08:49:16 2013
@@ -965,9 +965,11 @@ struct CStringHash
 
 } /* Namespace */
 
-/* Helper method to support OString messages in OSL_ENSURE */
+/* Helper methods to support OString messages in OSL_ENSURE, DBG_ERROR, DBG_WARN, DBG_TRACE, etc. */
 inline sal_Bool SAL_CALL osl_assertFailedLine( const sal_Char* pszFileName, sal_Int32 nLine, const ::rtl::OString& rMessage)
-{ return osl_assertFailedLine( pszFileName, nLine, rMessage.getStr()); }
+	{ return osl_assertFailedLine( pszFileName, nLine, rMessage.getStr()); }
+inline void DbgOut( const rtl::OString& rMessage, sal_uInt16 nOutType, const sal_Char* pFileName, sal_uInt16 nLineNum )
+	{ DbgOut( rMessage.getStr(), nOutType, pFileName, nLineNum); }
 
 #endif /* __cplusplus */
 

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx Wed Dec 11 08:49:16 2013
@@ -230,7 +230,6 @@ sal_Int32
     ScAccessibleCellBase::createAccessibleName(void)
     throw (uno::RuntimeException)
 {
-	//String sName( ScResId(STR_ACC_CELL_NAME) );
 	String sAddress;
 	// Document not needed, because only the cell address, but not the tablename is needed
 	// always us OOO notation
@@ -239,8 +238,6 @@ sal_Int32
     /*  #i65103# ZoomText merges cell address and contents, e.g. if value 2 is
         contained in cell A1, ZT reads "cell A twelve" instead of "cell A1 - 2".
         Simple solution: Append a space character to the cell address. */
-    //sName.Append( ' ' );
-    //return rtl::OUString(sName);
     return rtl::OUString(sAddress);
 }
 
@@ -254,7 +251,6 @@ uno::Any SAL_CALL
     IsObjectValid();
 	uno::Any aAny;
 	if (mpDoc)
-		//aAny <<= mpDoc->GetValue(maCellAddress);
 	{
 		String valStr;
 		mpDoc->GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab(), valStr);

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx Wed Dec 11 08:49:16 2013
@@ -543,7 +543,6 @@ ScAccessibleDataPilotButton::ScAccessibl
         ScPivotFieldWindow* pFieldWindow,
         sal_Int32 nIndex)
 //change role frome PUSH_BUTTON to BUTTON_MENU
-    //: ScAccessibleContextBase(rxParent, AccessibleRole::PUSH_BUTTON),
     : ScAccessibleContextBase(rxParent, AccessibleRole::BUTTON_MENU),
     mpFieldWindow(pFieldWindow),
     mnIndex(nIndex)

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDocument.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Wed Dec 11 08:49:16 2013
@@ -1625,10 +1625,8 @@ void ScAccessibleDocument::Notify( SfxBr
 
                 mpTempAccEdit = NULL;
                 RemoveChild(mxTempAcc, sal_True);
-                //if (mpAccessibleSpreadsheet)
                 if (mpAccessibleSpreadsheet && mpViewShell->IsActive())
                     mpAccessibleSpreadsheet->GotFocus();
-                //else
                 else if( mpViewShell->IsActive())
                     CommitFocusGained();
             }

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx Wed Dec 11 08:49:16 2013
@@ -283,8 +283,6 @@ ScAccessibleSpreadsheet::~ScAccessibleSp
 {
 	if (mpMarkedRanges)
 		delete mpMarkedRanges;
-	//if (mpSortedMarkedCells)
-	//	delete mpSortedMarkedCells;
 	if (mpViewShell)
 		mpViewShell->RemoveAccessibilityObject(*this);
 }
@@ -351,8 +349,6 @@ void ScAccessibleSpreadsheet::CompleteSe
 	}
 	if (mpMarkedRanges)
 		DELETEZ(mpMarkedRanges);
-	//if (mpSortedMarkedCells)
-	//	DELETEZ(mpSortedMarkedCells);
 	mbHasSelection = bNewState;
 
     AccessibleEventObject aEvent;
@@ -381,11 +377,9 @@ void ScAccessibleSpreadsheet::LostFocus(
 
 void ScAccessibleSpreadsheet::GotFocus()
 {
-    //CommitFocusGained();
 	AccessibleEventObject aEvent;
 	aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
 	aEvent.Source = uno::Reference< XAccessibleContext >(this);
-    //uno::Reference< XAccessible > xNew = mpAccCell;
     uno::Reference< XAccessible > xNew;
 	if (IsFormulaMode())
 	{
@@ -447,68 +441,6 @@ void ScAccessibleSpreadsheet::Notify( Sf
 	if (rHint.ISA( SfxSimpleHint ) )
 	{
 		const SfxSimpleHint& rRef = (const SfxSimpleHint&)rHint;
-		// only notify if child exist, otherwise it is not necessary
-		//if ((rRef.GetId() == SC_HINT_ACC_CURSORCHANGED))
-		//{
-		//	if (mpViewShell)
-		//	{
-		//		ScAddress aNewCell = mpViewShell->GetViewData()->GetCurPos();
-		//		sal_Bool bNewMarked(mpViewShell->GetViewData()->GetMarkData().GetTableSelect(aNewCell.Tab()) &&
-		//			(mpViewShell->GetViewData()->GetMarkData().IsMarked() ||
-		//			mpViewShell->GetViewData()->GetMarkData().IsMultiMarked()));
-		//		sal_Bool bNewCellSelected(isAccessibleSelected(aNewCell.Row(), aNewCell.Col()));
-		//		if ((bNewMarked != mbHasSelection) ||
-		//			(!bNewCellSelected && bNewMarked) ||
-		//			(bNewCellSelected && mbHasSelection))
-		//		{
-		//			if (mpMarkedRanges)
-		//				DELETEZ(mpMarkedRanges);
-		//			if (mpSortedMarkedCells)
-		//				DELETEZ(mpSortedMarkedCells);
-		//			AccessibleEventObject aEvent;
-		//			aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
-		//			aEvent.Source = uno::Reference< XAccessibleContext >(this);
-
-		//			mbHasSelection = bNewMarked;
-
-		//			CommitChange(aEvent);
-		//		}
-
-  //              // active descendant changed event (new cell selected)
-  //              bool bFireActiveDescChanged = (aNewCell != maActiveCell) &&
-  //                  (aNewCell.Tab() == maActiveCell.Tab()) && IsFocused();
-
-  //              /*  Remember old active cell and set new active cell.
-  //                  #i82409# always update the class members mpAccCell and
-  //                  maActiveCell, even if the sheet is not focused, e.g. when
-  //                  using the name box in the toolbar. */
-  //              uno::Reference< XAccessible > xOld = mpAccCell;
-  //              mpAccCell->release();
-  //              mpAccCell = GetAccessibleCellAt(aNewCell.Row(), aNewCell.Col());
-  //              mpAccCell->acquire();
-  //              mpAccCell->Init();
-  //              uno::Reference< XAccessible > xNew = mpAccCell;
-  //              maActiveCell = aNewCell;
-
-  //              // #i14108# fire event only if sheet is focused
-  //              if( bFireActiveDescChanged )
-  //              {
-  //                  AccessibleEventObject aEvent;
-  //                  aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
-  //                  aEvent.Source = uno::Reference< XAccessibleContext >(this);
-  //                  aEvent.OldValue <<= xOld;
-  //                  aEvent.NewValue <<= xNew;
-		//			CommitChange(aEvent);
-  //              }
-		//	}
-		//}
-		//else if ((rRef.GetId() == SC_HINT_DATACHANGED))
-		//{
-		//	if (!mbDelIns)
-		//		CommitTableModelChange(maRange.aStart.Row(), maRange.aStart.Col(), maRange.aEnd.Row(), maRange.aEnd.Col(), AccessibleTableModelChangeType::UPDATE);
-		//	else
-		//		mbDelIns = sal_False;
-		//}
 		if ((rRef.GetId() == SC_HINT_ACC_CURSORCHANGED))
 		{
 			if (mpViewShell)
@@ -1391,50 +1323,6 @@ void ScAccessibleSpreadsheet::SelectCell
 
 	mpViewShell->SelectionChanged();
 }
-//void ScAccessibleSpreadsheet::CreateSortedMarkedCells()
-//{
-//	mpSortedMarkedCells = new std::vector<ScMyAddress>();
-//	mpSortedMarkedCells->reserve(mpMarkedRanges->GetCellCount());
-//	ScRange* pRange = mpMarkedRanges->First();
-//	while (pRange)
-//	{
-//		if (pRange->aStart.Tab() != pRange->aEnd.Tab())
-//		{
-//			if ((maActiveCell.Tab() >= pRange->aStart.Tab()) ||
-//				maActiveCell.Tab() <= pRange->aEnd.Tab())
-//			{
-//				ScRange aRange(*pRange);
-//				aRange.aStart.SetTab(maActiveCell.Tab());
-//				aRange.aEnd.SetTab(maActiveCell.Tab());
-//				AddMarkedRange(aRange);
-//			}
-//			else
-//			{
-//				DBG_ERROR("Range of wrong table");
-//			}
-//		}
-//		else if(pRange->aStart.Tab() == maActiveCell.Tab())
-//			AddMarkedRange(*pRange);
-//		else
-//		{
-//			DBG_ERROR("Range of wrong table");
-//		}
-//		pRange = mpMarkedRanges->Next();
-//	}
-//	std::sort(mpSortedMarkedCells->begin(), mpSortedMarkedCells->end());
-//}
-
-/*void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange)
-{
-	for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
-	{
-		for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
-		{
-			ScMyAddress aCell(nCol, nRow, maActiveCell.Tab());
-			mpSortedMarkedCells->push_back(aCell);
-		}
-	}
-}*/
 
 	//=====  XServiceInfo  ====================================================
 
@@ -1483,20 +1371,6 @@ void SAL_CALL ScAccessibleSpreadsheet::a
     ScUnoGuard aGuard;
     IsObjectValid();
     ScAccessibleTableBase::addEventListener(xListener);
-
-/*    if (!mbIsFocusSend)
-    {
-        mbIsFocusSend = sal_True;
-        CommitFocusGained();
-
-		AccessibleEventObject aEvent;
-		aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
-		aEvent.Source = uno::Reference< XAccessibleContext >(this);
-		aEvent.NewValue <<= getAccessibleCellAt(maActiveCell.Row(), maActiveCell.Col());
-
-		CommitChange(aEvent);
-    }
-*/
 }
 
 	//====  internal  =========================================================

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx Wed Dec 11 08:49:16 2013
@@ -170,12 +170,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
 			ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
 		if (nEndRow > nRow)
 			   nCount = nEndRow - nRow + 1;
-	//	if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow),
-	//		nEndCol, nEndRow, maRange.aStart.Tab()))
-        //{
-	//	    if (nEndRow > nRow)
-	//		    nCount = nEndRow - nRow + 1;
-        //}
 	}
 
 	return nCount;
@@ -203,12 +197,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
 			ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
 		if (nEndCol > nColumn)
 			    nCount = nEndCol - nColumn + 1;
-	//	if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow),
-	//		nEndCol, nEndRow, maRange.aStart.Tab()))
-        //{
-	//	    if (nEndCol > nColumn)
-	//		    nCount = nEndCol - nColumn + 1;
-        //}
 	}
 
 	return nCount;

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleText.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleText.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleText.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/Accessibility/AccessibleText.cxx Wed Dec 11 08:49:16 2013
@@ -1058,7 +1058,6 @@ ScDocShell* ScAccessibleCellTextData::Ge
 
 
 // ============================================================================
-//ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin)
 ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone)
 	:
 	mpViewForwarder(NULL),
@@ -1070,7 +1069,6 @@ ScAccessibleEditObjectTextData::ScAccess
 {
 	// Solution: If the object is cloned, do NOT add notify hdl.
 	mbIsCloned = isClone;
-    //if (mpEditEngine)
     if (mpEditEngine && !mbIsCloned)
         mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
 }
@@ -1078,7 +1076,6 @@ ScAccessibleEditObjectTextData::ScAccess
 ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData()
 {
 	// Solution: If the object is cloned, do NOT set notify hdl.
-    //if (mpEditEngine)
     if (mpEditEngine && !mbIsCloned)
         mpEditEngine->SetNotifyHdl(Link());
 	if (mpViewForwarder)
@@ -1123,7 +1120,6 @@ SvxTextForwarder* ScAccessibleEditObject
         if (!mpEditEngine)
             mpEditEngine = mpEditView->GetEditEngine();
 			// Solution: If the object is cloned, do NOT add notify hdl.
-        //if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet())
 	if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet()&&!mbIsCloned)
             mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
         if(!mpForwarder)

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/inc/AccessibleDocument.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/inc/AccessibleDocument.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/inc/AccessibleDocument.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/inc/AccessibleDocument.hxx Wed Dec 11 08:49:16 2013
@@ -29,7 +29,6 @@
 #include "viewdata.hxx"
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-//#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/content.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/content.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/navipi/content.cxx Wed Dec 11 08:49:16 2013
@@ -988,7 +988,6 @@ void ScContentTree::GetDrawNames( sal_uI
 						String aName = ScDrawLayer::GetVisibleName( pObject );
 						if (aName.Len())
 						{
-							//InsertContent( nType, aName );
 							if( bisInNavigatoeDlg )
 							{
 								if (nType >= SC_CONTENT_COUNT)

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx Wed Dec 11 08:49:16 2013
@@ -3106,7 +3106,6 @@ void __EXPORT ScGridWindow::KeyInput(con
         if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
         {
             SC_MOD()->EndReference();
-            //return;
         }
         else if( pViewData->GetViewShell()->MoveCursorKeyInput( rKEvt ) )
         {
@@ -3114,7 +3113,6 @@ void __EXPORT ScGridWindow::KeyInput(con
                 pViewData->GetRefStartX(), pViewData->GetRefStartY(), pViewData->GetRefStartZ(),
                 pViewData->GetRefEndX(), pViewData->GetRefEndY(), pViewData->GetRefEndZ() );
             SC_MOD()->SetReference( aRef, pViewData->GetDocument() );
-            //return;
         }
 		pViewData->GetViewShell()->SelectionChanged();
 		return ;

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin5.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin5.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin5.cxx Wed Dec 11 08:49:16 2013
@@ -432,12 +432,10 @@ com::sun::star::uno::Reference< ::com::s
 	ScAccessibleDocument* pAccessibleDocument =
 		new ScAccessibleDocument(GetAccessibleParentWindow()->GetAccessible(),
 			pViewData->GetViewShell(), eWhich);
-	//com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccessible = pAccessibleDocument;
 	xAcc = pAccessibleDocument;
 	SetAccessible(xAcc);
 
 	pAccessibleDocument->Init();
-	//return xAccessible;
 	return xAcc;
 }
 // MT: Removed Windows::SwitchView() introduced with IA2 CWS.

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/output.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/output.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/output.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/output.cxx Wed Dec 11 08:49:16 2013
@@ -77,29 +77,6 @@ static ColorData nAuthorColor[ SC_AUTHOR
 					COL_GREEN,			COL_RED,			COL_BLUE,
 					COL_BROWN,			COL_MAGENTA,		COL_CYAN };
 
-//	Hilfsklasse, fuer die Farbzuordnung,
-//	um nicht mehrfach hintereinander denselben User aus der Liste zu suchen
-
-//Move this class declare to Chgtrack.hxx
-/*
-class ScActionColorChanger
-{
-private:
-	const ScAppOptions&		rOpt;
-	const ScStrCollection&	rUsers;
-	String					aLastUserName;
-	sal_uInt16					nLastUserIndex;
-	ColorData				nColor;
-
-public:
-				ScActionColorChanger( const ScChangeTrack& rTrack );
-				~ScActionColorChanger() {}
-
-	void		Update( const ScChangeAction& rAction );
-	ColorData	GetColor() const	{ return nColor; }
-};
-*/
-
 //------------------------------------------------------------------
 
 ScActionColorChanger::ScActionColorChanger( const ScChangeTrack& rTrack ) :

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/preview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/preview.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/preview.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/preview.cxx Wed Dec 11 08:49:16 2013
@@ -1481,11 +1481,9 @@ com::sun::star::uno::Reference<com::sun:
 	}
 	ScAccessibleDocumentPagePreview* pAccessible =
 		new ScAccessibleDocumentPagePreview( GetAccessibleParentWindow()->GetAccessible(), pViewShell );
-	//com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xAccessible = pAccessible;
 	xAcc = pAccessible;
 	SetAccessible(xAcc);
 	pAccessible->Init();
-	//return xAccessible;
 	return xAcc;
 }
 // MT: Removed Windows::SwitchView() introduced with IA2 CWS.

Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun2.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun2.cxx Wed Dec 11 08:49:16 2013
@@ -1616,7 +1616,6 @@ void ScViewFunc::AutoFormat( sal_uInt16 
 //----------------------------------------------------------------------------
 //	Suchen & Ersetzen
 
-//void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
 sal_Bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
 										sal_Bool bAddUndo, sal_Bool bIsApi )
 {
@@ -1670,7 +1669,6 @@ sal_Bool ScViewFunc::SearchAndReplace( c
 				if ( pOldSelectedTables )
 					delete [] pOldSelectedTables;
 				ErrorMessage(STR_PROTECTIONERR);
-				//return;
 				return sal_False;
 			}
 		}



Mime
View raw message