[ooo-build-commit] Branch 'ooo/master' - 2 commits - sdext/source swext/mediawiki

[Jan Holesovsky]

 sdext/source/pdfimport/tree/pdfiprocessor.cxx |   33 +-------------------------
 swext/mediawiki/help/makefile.mk              |    2 -
 2 files changed, 3 insertions(+), 32 deletions(-)

New commits:
commit 54439e09e8024e0198932a010e16ff6a97da332b
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Jun 22 13:27:05 2009 +0000

    #i10000# build fix

diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index 6281467..b706f33 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -72,6 +72,6 @@ $(OUT_HELP)$/{$(MEDIAWIKI_LANG)}$/$(PACKAGE)$/%.xhp :| %.xhp
 
 
 $(OUT_MEDIAWIKI)$/$(TARGET).done : $(LOCALIZESDF) $(XHPFILES) $(HLANGXHPFILES)
-    @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) helpex -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+    @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
 .ENDIF
 
commit 1fbf1dc2bc1d451616e31530e0da15383d47aafb
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Jun 22 10:07:11 2009 +0000

    #i10000# build fix

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 48950c1..4045676 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -455,36 +455,8 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString&             rGlyphs,
     )
     {
         processGlyphLine();
-
-       CharGlyph aGlyph;
-
-       aGlyph.setGlyph ( rGlyphs );
-       aGlyph.setRect  ( rRect );
-       aGlyph.setFontMatrix ( rFontMatrix );
-       aGlyph.setGraphicsContext ( getCurrentContext() );
-       getGCId(getCurrentContext());
-       aGlyph.setCurElement( m_pCurElement );
-
-       aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
-       aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
-       aGlyph.setPrevGlyphHeight  ( fPrevTextHeight );
-       aGlyph.setPrevGlyphWidth   ( fPrevTextWidth );
-
-       m_GlyphsList.push_back( aGlyph );
-
-       fYPrevTextPosition  = rRect.Y1;
-       fXPrevTextPosition  = rRect.X2;
-       fPrevTextHeight     = rRect.Y2-rRect.Y1;
-       fPrevTextWidth      = rRect.X2-rRect.X1;
-
-       if( !m_bIsWhiteSpaceInLine )
-       {
-         rtl::OUString tempWhiteSpaceStr( 32 );
-         m_bIsWhiteSpaceInLine=rGlyphs.equals( tempWhiteSpaceStr );
-       }
-
-=======
-    
+    }
+   
     CharGlyph aGlyph;
     
     aGlyph.setGlyph ( rGlyphs );
@@ -512,7 +484,6 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString&             rGlyphs,
         static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); 
         m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
     }
->>>>>>> .merge-right.r272944
 }
 
 GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph )