[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.84.ooo44846.svxcasting.patch, 1.2, 1.3



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32749

Modified Files:
	openoffice.org-1.9.84.ooo44846.svxcasting.patch 
Log Message:
rejig patch

openoffice.org-1.9.84.ooo44846.svxcasting.patch:
 bf_svx/source/unoedit/svx_unotext2.cxx           |    0 
 binfilter/bf_svx/source/unoedit/svx_unotext2.cxx |    8 ++++----
 source/unoedit/unotext2.cxx                      |    0 
 svx/source/unoedit/unotext2.cxx                  |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

Index: openoffice.org-1.9.84.ooo44846.svxcasting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.84.ooo44846.svxcasting.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.84.ooo44846.svxcasting.patch	13 Jun 2005 09:16:24 -0000	1.2
+++ openoffice.org-1.9.84.ooo44846.svxcasting.patch	30 Jun 2005 08:45:51 -0000	1.3
@@ -1,29 +1,29 @@
-Index: source/unoedit/unotext2.cxx
+Index: bf_svx/source/unoedit/svx_unotext2.cxx
 ===================================================================
-RCS file: /cvs/graphics/svx/source/unoedit/unotext2.cxx,v
-retrieving revision 1.17
-diff -u -p -r1.17 unotext2.cxx
---- openoffice.org.orig/svx/source/unoedit/unotext2.cxx	26 Nov 2004 18:16:55 -0000	1.17
-+++ openoffice.org/svx/source/unoedit/unotext2.cxx	11 Mar 2005 19:06:04 -0000
-@@ -95,7 +95,7 @@ using namespace ::com::sun::star;
+RCS file: /cvs/framework/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx,v
+retrieving revision 1.3
+diff -u -p -r1.3 svx_unotext2.cxx
+--- openoffice.org.orig/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx	3 Aug 2004 16:48:10 -0000	1.3
++++ openoffice.org/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx	13 Jun 2005 09:09:31 -0000
+@@ -109,7 +109,7 @@ using namespace ::com::sun::star;
  SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw()
  : rText( _rText )
  {
 -	xParentText =  (text::XText*)&_rText;
-+	xParentText = const_cast<SvxUnoTextBase*>(&rText);
++	xParentText =  const_cast<SvxUnoTextBase*>(&rText);
  	if( rText.GetEditSource() )
  		pEditSource = rText.GetEditSource()->Clone();
  	else
-@@ -173,7 +173,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
- 	aDisposeListeners(aDisposeContainerMutex),
+@@ -171,7 +171,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
+ 	nParagraph(nPara),
  	bDisposing( sal_False )
  {
 -	xParentText =  (text::XText*)&rText;
-+	xParentText = const_cast<SvxUnoTextBase*>(&rText);
++	xParentText =  const_cast<SvxUnoTextBase*>(&rText);
  	SetSelection( ESelection( nParagraph,0, nParagraph, GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
  }
  
-@@ -422,7 +422,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
+@@ -418,7 +418,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
  // ====================================================================
  
  SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw()
@@ -32,41 +32,41 @@
  	rParentText( rText ),
  	nParagraph( nPara ),
  	nNextPortion( 0 )
-@@ -513,7 +513,7 @@ uno::Reference< uno::XInterface > SvxUno
+@@ -495,7 +495,7 @@ uno::Reference< uno::XInterface > SvxUno
  
  SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw()
  :	SvxUnoTextRangeBase(rText),
 -	xParentText( (text::XText*)&rText)
-+	xParentText(  const_cast<SvxUnoTextBase*>(&rText))
++	xParentText(  const_cast<SvxUnoTextBase*>(&rText) )
  {
  }
  
-Index: bf_svx/source/unoedit/svx_unotext2.cxx
+Index: source/unoedit/unotext2.cxx
 ===================================================================
-RCS file: /cvs/framework/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx,v
-retrieving revision 1.3
-diff -u -p -r1.3 svx_unotext2.cxx
---- openoffice.org.orig/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx	3 Aug 2004 16:48:10 -0000	1.3
-+++ openoffice.org/binfilter/bf_svx/source/unoedit/svx_unotext2.cxx	13 Jun 2005 09:09:31 -0000
-@@ -109,7 +109,7 @@ using namespace ::com::sun::star;
+RCS file: /cvs/graphics/svx/source/unoedit/unotext2.cxx,v
+retrieving revision 1.19
+diff -u -p -r1.19 unotext2.cxx
+--- openoffice.org.orig/svx/source/unoedit/unotext2.cxx	28 Jun 2005 15:38:34 -0000	1.19
++++ openoffice.org/svx/source/unoedit/unotext2.cxx	30 Jun 2005 08:41:42 -0000
+@@ -95,7 +95,7 @@ using namespace ::com::sun::star;
  SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw()
  : rText( _rText )
  {
 -	xParentText =  (text::XText*)&_rText;
-+	xParentText =  const_cast<SvxUnoTextBase*>(&rText);
++	xParentText = const_cast<SvxUnoTextBase*>(&rText);
  	if( rText.GetEditSource() )
  		pEditSource = rText.GetEditSource()->Clone();
  	else
-@@ -171,7 +171,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
- 	nParagraph(nPara),
+@@ -176,7 +176,7 @@ SvxUnoTextContent::SvxUnoTextContent( co
+ 	aDisposeListeners(aDisposeContainerMutex),
  	bDisposing( sal_False )
  {
 -	xParentText =  (text::XText*)&rText;
-+	xParentText =  const_cast<SvxUnoTextBase*>(&rText);
- 	SetSelection( ESelection( nParagraph,0, nParagraph, GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
++	xParentText = const_cast<SvxUnoTextBase*>(&rText);
+ 	if( GetEditSource() && GetEditSource()->GetTextForwarder() )
+ 		SetSelection( ESelection( nParagraph,0, nParagraph, GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
  }
- 
-@@ -418,7 +418,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
+@@ -443,7 +443,7 @@ uno::Sequence< OUString > SAL_CALL SvxUn
  // ====================================================================
  
  SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw()
@@ -75,12 +75,12 @@
  	rParentText( rText ),
  	nParagraph( nPara ),
  	nNextPortion( 0 )
-@@ -495,7 +495,7 @@ uno::Reference< uno::XInterface > SvxUno
+@@ -534,7 +534,7 @@ uno::Reference< uno::XInterface > SvxUno
  
  SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw()
  :	SvxUnoTextRangeBase(rText),
 -	xParentText( (text::XText*)&rText)
-+	xParentText(  const_cast<SvxUnoTextBase*>(&rText) )
++	xParentText(  const_cast<SvxUnoTextBase*>(&rText))
  {
  }
  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]