From 75877a17a64411bd6bbad536f0d6885d69b5f149 Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Mon, 29 Mar 2010 16:24:13 +0200 Subject: [PATCH] native0ext:#161688# rebranding extensions - transplanted from 28f77bc32e70@native0 --- mysqlc/mysqlc | 1 + mysqlc/source/description.xml | 4 +- .../source/description/description_en-US.txt | 2 +- mysqlc/source/makefile.mk | 4 +- mysqlc/version.mk | 2 +- reportbuilder/images/em42.png | Bin 1965 -> 1814 bytes reportbuilder/images/em42_hc.png | Bin 1160 -> 3119 bytes reportbuilder/util/component.txt | 2 +- reportbuilder/util/description.xml | 9 ++- reportbuilder/util/makefile.mk | 6 +- reportbuilder/util/manifest.xml | 2 - sdext/prj/d.lst | 2 +- sdext/source/minimizer/description.xml | 7 +- sdext/source/minimizer/help/component.txt | 4 +- sdext/source/minimizer/makefile.mk | 16 +++-- sdext/source/pdfimport/config/description.xml | 6 +- sdext/source/pdfimport/help/component.txt | 4 +- sdext/source/pdfimport/images/pdfiext.png | Bin 1965 -> 5483 bytes sdext/source/pdfimport/images/pdfiext_hc.png | Bin 1160 -> 3187 bytes sdext/source/pdfimport/wrapper/wrapper.cxx | 63 ++++++++++++++++-- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 53 +++++++++++++-- swext/mediawiki/help/component.txt | 4 +- swext/mediawiki/src/description.xml | 4 +- 23 files changed, 150 insertions(+), 45 deletions(-) create mode 120000 mysqlc/mysqlc mode change 100644 => 100755 reportbuilder/images/em42.png mode change 100644 => 100755 reportbuilder/images/em42_hc.png diff --git a/mysqlc/mysqlc b/mysqlc/mysqlc new file mode 120000 index 000000000000..f6629f4ad545 --- /dev/null +++ b/mysqlc/mysqlc @@ -0,0 +1 @@ +../ooo/mysqlc \ No newline at end of file diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml index e5a17a11851a..dbd64aa1a7e1 100644 --- a/mysqlc/source/description.xml +++ b/mysqlc/source/description.xml @@ -6,7 +6,7 @@ - + @@ -17,7 +17,7 @@ - Sun Microsystems + Oracle diff --git a/mysqlc/source/description/description_en-US.txt b/mysqlc/source/description/description_en-US.txt index e149658af7de..bb3cf174a772 100644 --- a/mysqlc/source/description/description_en-US.txt +++ b/mysqlc/source/description/description_en-US.txt @@ -1 +1 @@ -Connects OpenOffice.org directly with MySQL Servers +The MySQL Connector for Oracle Open Office (formerly StarOffice) and OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base. diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index ff1c8c83f7c4..bfe46afe05e0 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -56,10 +56,10 @@ EXTENSION_VERSION_BASE=$(MYSQLC_VERSION_MAJOR).$(MYSQLC_VERSION_MINOR).$(MYSQLC_ #---- extension title package name .IF "$(MYSQLC_STATUS)" == "final" EXTENSION_TITLE:=$(MYSQLC_TITLE) - EXTENSION_ZIPNAME:=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l) + EXTENSION_ZIPNAME:=$(EXTENSIONNAME) .ELSE EXTENSION_TITLE:=$(MYSQLC_TITLE) ($(MYSQLC_STATUS)) - EXTENSION_ZIPNAME:=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(MYSQLC_STATUS:s/ /-/:l)-$(RTL_OS:l)-$(RTL_ARCH:l) + EXTENSION_ZIPNAME:=$(EXTENSIONNAME) .ENDIF #------------------------------------------------------------------- diff --git a/mysqlc/version.mk b/mysqlc/version.mk index 81a2cfd23da8..e9bc6495288f 100644 --- a/mysqlc/version.mk +++ b/mysqlc/version.mk @@ -30,7 +30,7 @@ MYSQLC_VERSION_MINOR=0 MYSQLC_VERSION_MICRO=1 # the title, as displayed in the Extension Manager -MYSQLC_TITLE=MySQL Connector for OpenOffice.org +MYSQLC_TITLE=MySQL Connector # the status of the extension # if this is different from "final", it will be appended to the title displayed in the Extension Manager diff --git a/reportbuilder/images/em42.png b/reportbuilder/images/em42.png old mode 100644 new mode 100755 index 31f48ea8fb6963fa33214dc6ef5350646f7489ce..4906707257bf8722af26ffc7970f4c8c799c4357 GIT binary patch delta 1810 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 Q-T(jq07*qoM6N<$f|n3F`~Uy| diff --git a/reportbuilder/util/component.txt b/reportbuilder/util/component.txt index 17f312c8ea72..3b6ba3156efc 100644 --- a/reportbuilder/util/component.txt +++ b/reportbuilder/util/component.txt @@ -1 +1 @@ -Create with the Sun Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports. +Create with the Oracle Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports. diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index c254d5bd1a73..9a495af0fd71 100644 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -3,11 +3,11 @@ xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - Sun Report Builder + Oracle Report Builder - + @@ -17,11 +17,14 @@ - Sun Microsystems, Inc. + Oracle, Inc. + + + diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index f36b1f50406c..1c69f01333cf 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -28,7 +28,7 @@ PRJ=.. PRJNAME=reportbuilder TARGET=rpt -EXTENSION_VERSION_BASE=1.2.0 +EXTENSION_VERSION_BASE=1.2.1 .IF "$(CWS_WORK_STAMP)" == "" EXTENSION_VERSION=$(EXTENSION_VERSION_BASE) @@ -41,8 +41,8 @@ EXTENSION_VERSION_BASE=1.2.0 .IF "$(L10N_framework)"=="" # ------------------------------------------------------------------ # calready set in util$/makefile.pmk -# EXTENSIONNAME:=sun-report-builder -EXTENSION_ZIPNAME:=sun-report-builder +# EXTENSIONNAME:=oracle-report-builder +EXTENSION_ZIPNAME:=oracle-report-builder # create Extension ----------------------------- diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/manifest.xml index 8ea30b6ad08e..1a5a0f84623b 100644 --- a/reportbuilder/util/manifest.xml +++ b/reportbuilder/util/manifest.xml @@ -3,5 +3,3 @@ - diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst index 802a8b348c35..71a91653c3d2 100644 --- a/sdext/prj/d.lst +++ b/sdext/prj/d.lst @@ -4,5 +4,5 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.* ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.* ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt -..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\sun-presentation-minimizer.oxt +..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index 54cb88762a4d..777e3afff558 100644 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -17,7 +17,7 @@ - + @@ -29,4 +29,9 @@ Presentation Minimizer + + + + + diff --git a/sdext/source/minimizer/help/component.txt b/sdext/source/minimizer/help/component.txt index f6222edc2386..1ba57790087c 100755 --- a/sdext/source/minimizer/help/component.txt +++ b/sdext/source/minimizer/help/component.txt @@ -1,3 +1 @@ -The Presentation Minimizer is used to reduce the file size of the current -presentation. Images will be compressed, and data that is no longer needed -will be removed. +The Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed, and data that is no longer needed will be removed. diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 1140494e17de..a0b89e185fa7 100644 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -27,7 +27,7 @@ PRJ=..$/.. PRJNAME=sdext -TARGET=SunPresentationMinimizer +TARGET=PresentationMinimizer GEN_HID=FALSE ENABLE_EXCEPTIONS=TRUE @@ -38,8 +38,8 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : $(PRJ)$/util$/makefile.pmk # set in minimizer.pmk -#EXTENSIONNAME:=SunPresentationMinimizer -EXTENSION_ZIPNAME:=sun-presentation-minimizer +#EXTENSIONNAME:=PresentationMinimizer +EXTENSION_ZIPNAME:=presentation-minimizer .IF "$(ENABLE_MINIMIZER)" != "YES" @all: @@ -106,6 +106,10 @@ COMPONENT_BITMAPS= \ $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80.png \ $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png +COMPONENT_IMAGES=\ + $(EXTENSIONDIR)$/bitmaps$/em42.png \ + $(EXTENSIONDIR)$/bitmaps$/em42_hc.png + # rather freestyle or common to all? COMPONENT_HELP= \ $(EXTENSIONDIR)$/help$/help_de.odt \ @@ -113,7 +117,7 @@ COMPONENT_HELP= \ $(EXTENSIONDIR)$/help$/component.txt # make sure to add your custom files here -EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_HELP) +EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) # --- Targets ---------------------------------- @@ -129,6 +133,10 @@ $(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(COMPONENT_IMAGES) : images$/$$(@:f) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(COMPONENT_HELP) : help$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index 08e2f505653a..c2d36bd58be1 100644 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -11,7 +11,7 @@ - + @@ -21,11 +21,11 @@ - Sun Microsystems + Oracle - PDF Import Extension + PDF Import diff --git a/sdext/source/pdfimport/help/component.txt b/sdext/source/pdfimport/help/component.txt index e2dfbc9b99f6..dc138d891f80 100755 --- a/sdext/source/pdfimport/help/component.txt +++ b/sdext/source/pdfimport/help/component.txt @@ -1,3 +1 @@ -PDF documents are imported in Draw and Impress to preserve the layout and to -allow basic editing. It is the perfect solution for changing dates, numbers -or small portions of text. +PDF documents are imported in Draw and Impress to preserve the layout and to allow basic editing. It is the perfect solution for changing dates, numbers or small portions of text. diff --git a/sdext/source/pdfimport/images/pdfiext.png b/sdext/source/pdfimport/images/pdfiext.png index 31f48ea8fb6963fa33214dc6ef5350646f7489ce..cf3fe5f0d59882a79dfd63910f001cebb396e876 100644 GIT binary patch literal 5483 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 literal 1965 zcmV;e2U7TnP)A8}gI!rFw z-Sx>!7qSYPJs2H~w2sev1c>XGEu0&e zKkFoP9P2;fK>G(raIoVj%7Q+`x(>W;0W}5GESNhJf*`=_kxn?!SRx6-G*A%^Akq6< zj|CJa1W6L1>jr^6u^>|!83RL6ctr_y)fH^Y$O0v#8CjhaJ13Qv@%L~P9!kiXstOy= zGxjBlZSqLpF#hNroNyp>8*4GAzPcbkk;-5=mVhVbV31~c-VnK!=dK?~QKvQ<0reUIUATi-UnO>)@T*^>n6-9-I_KZer z?H(ogNlIdyLfUn*YD_#(((AO9OKC-cZs-(x0|s}`lw;Q$RH{;nUexH(SR3|ke%u9%o68NdZ!Mim)X+f6k4|5huw#=r?u_(+>8gGc@5RnI!%@$a>kLr z{{qc@Scr7Pv>v}lQKbSJ3Js`>B6~4%L;s6FQt-> z#`8Be+72bAiM%g2awf}zUYt_Vgj;ugVb9weF0|fnd;2RJZ+2}HmrKamJZ^b(EC20? z#L+#Jv>!+m4K=m3NFVAzLtQP7_VkfwwY9{0-Rkvjh1uRwOgwS<=co$#_;@6#;Hp>Z zZM&X%@V(pnFeN;;CYn;vAG3##d9fHZo-~tkw-wW;)}ph!huPg=0fh@tUAK3o2pNpz z7@b0Zd3nkn7y0!ovER2D)VTNHr5&|M@xm?NtNW$*)>hLamSwQS+lN* z&!?#D6rx=_cktik=d8klMW^TSqk|DTkWi2X5z`51Z=~N(-Rx>&edrqcQXXYdcy{Ah z&U!?4Br{xd(oL@lW zh-B*8xx9tC9Uib87SYt6lYuQ@DCMgy?`Z4pmKa zoFjl>D8$f-R9%)9@Tf*NK~LWNuLpldxMB)d%0iSUN2Nt1<80l!4cEHrwOS&{=X%gJ zjU-;CBtko@K*4wSD4Q>)eB5|EI#f{pc**$pf=BoSdYvhvKxgv#e0k5x70c1v@l#O) zjL+7&$(Jg7PU06l0?K*}kFPV#?DXRI`|||1+_i;DhKbfa-=bm8BKU$~i>IWM`0GeJ zRnY{Pj`*7N+ALE6WU&n$o zS6jT!1K;58J2qiW^CjqxgXBG~yWY(Kg@_LP7)wpl%Quq~6l;k-pL;!wQ29K+`BFUJ z@~Taa$*_6G_xTE6m)#stxUuNG=QBaxLW9AeZNb#K2HdjYvXY8&<=B_6Usqga+VsXe zTg6CMWsD&;GCcI5ko|9#d5f1}#>ulwD$12xde+L)>se_Fg^tskbm^o!naRj7Vmy(; z;jnEHAJ@n0{!Q=kawIe)7D=XQ5k;0?` znxS$RkB#uEZtChmUiv+fB$QWFPAZ^r^4mb9k0q;SsG0o?=tyVB;p#KaJ{O^I*`xuQ zByUFg`j{W%O0@rgM^`hu5A6T$GOy3)zo>cLqyVYNGJ3kZAS;SusLH;~Kvz^KpR@dO zDNuHu=nY&z&8m7*#osg&dM5rr?AN_J{t;jRq*F3$2|mJb00000NkvXXu0mjfNo?e{ diff --git a/sdext/source/pdfimport/images/pdfiext_hc.png b/sdext/source/pdfimport/images/pdfiext_hc.png index 3870cc4709d4f3403d5fc1eaa9a8b6ae80b4a4ea..881a1c3b360162194946903b7c11f2897f4f56f2 100644 GIT binary patch literal 3187 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 ZZvd_Vw@#yB>xKXT002ovPDHLkV1fX1_c8zg literal 1160 zcmV;31b6$1P)pPVhASk!jlg^`o|TRWX;r!#cPaFUz${?2#rIrp4)-!Lls;src$l?2E}&!bnhex2n1ZVmNn&_q*~Rx2imE`xSVw$)CmOb z;)-_Iu_scrh7e@9_L1aD_iWUObmk8QMtAZ}r9+lnUW>sVVGbg^wCYzdT%LIxdV5K| zjc!<1eKfNlIPU(qKYo7|6j}BF`T#1Mlgu-O)G#=sw;YD!!!Z5r6jq!vSKk}$rnpy5TYXN+B)$O?KcZH(Itv$1eBueTS+ZHp5mc59 z`k+!QOLZ2^@=J-#3C_2}FXZiq3l^!s^WD8DP(u$Z|1Lh`2+9z5k5y6Z&RrmqOPtr? zsqqOoI`vZfFsn7VG(+c3WEw{%?DOJDttz#Z#wk7d#RQFC;R@ao0c> zvw2!5D{b2}erI5Cs9rw5l%t9Mq~lE#5vJ6eKD5I#=x0}dXnDO&rnb@ia;arsj^{mJ znGq(kIFNqD(`K5vJrB=6H_@_wVQv!FI3Ftt$WWz}4K&)*de$Su z>Go$vhJ{NXd<0LAjX2gvMbVEpMTTCD+cwj|qmwN+LoM!{dG$3%qh}a~zW?#3Z8u_O z{{dfbP>8TO8|a~9Q*A$Hn6xKOzHA%p?754sE^PeZVSk{Qlx(WU2)n#=0KE6^JJA1F z%2F=NQU~YLnBV6W!$yU$d%Wft48x=QtjDt(H#)ezM!}bnBCOb+bmE(OVeiOT?Lg4x z0YZaoSH5^y?_>tyB7X(_HLs?2or%PzF$7*r`wa270uO4c+#sRIZ}<^Vy@pusXT0W2 z1ItO6qOO#G#mt8IR~VB@Fe$N0!s2x0?>l+I#rssVfTNn4Fnv-uSe#f6^=y7yE9b8N aC%^#RlwW=qN6_8?0000(i_rStr.getLength())); + const sal_Char* const pOrig(i_rStr.getStr()); + sal_Char* const pBuffer(new sal_Char[nOrigLen + 1]); + + const sal_Char* pRead(pOrig); + sal_Char* pWrite(pBuffer); + const sal_Char* pCur(pOrig); + while ((pCur = strchr(pCur, '\\')) != 0) + { + const sal_Char cNext(pCur[1]); + if (cNext == 'n' || cNext == 'r' || cNext == '\\') + { + const size_t nLen(pCur - pRead); + strncpy(pWrite, pRead, nLen); + pWrite += nLen; + *pWrite = cNext == 'n' ? '\n' : (cNext == 'r' ? '\r' : '\\'); + ++pWrite; + pCur = pRead = pCur + 2; + } + else + { + // Just continue on the next character. The current + // block will be copied the next time it goes through the + // 'if' branch. + ++pCur; + } + } + // maybe there are some data to copy yet + if (sal::static_int_cast(pRead - pOrig) < nOrigLen) + { + const size_t nLen(nOrigLen - (pRead - pOrig)); + strncpy(pWrite, pRead, nLen); + pWrite += nLen; + } + *pWrite = '\0'; + + rtl::OString aResult(pBuffer); + delete[] pBuffer; + return aResult; + } + +} + + ::rtl::OString Parser::readNextToken() { OSL_PRECOND(m_nCharIndex!=-1,"insufficient input"); @@ -322,7 +376,7 @@ void Parser::readChar() readDouble(aUnoMatrix.m10); readDouble(aUnoMatrix.m11); - rtl::OString aChars = m_aLine.copy( m_nCharIndex ); + rtl::OString aChars = lcl_unescapeLineFeeds( m_aLine.copy( m_nCharIndex ) ); // chars gobble up rest of line m_nCharIndex = -1; @@ -476,7 +530,7 @@ void Parser::readFont() readInt32(nFileLen); nSize = nSize < 0.0 ? -nSize : nSize; - aFontName = m_aLine.copy( m_nCharIndex ); + aFontName = lcl_unescapeLineFeeds( m_aLine.copy( m_nCharIndex ) ); // name gobbles up rest of line m_nCharIndex = -1; @@ -668,8 +722,9 @@ void Parser::readLink() readDouble(aBounds.Y2); m_pSink->hyperLink( aBounds, - rtl::OStringToOUString( m_aLine.copy(m_nCharIndex), - RTL_TEXTENCODING_UTF8 )); + rtl::OStringToOUString( lcl_unescapeLineFeeds( + m_aLine.copy(m_nCharIndex) ), + RTL_TEXTENCODING_UTF8 ) ); // name gobbles up rest of line m_nCharIndex = -1; } diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 1fa9ff32b530..5361330fd697 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -37,6 +37,8 @@ #include #include +#include + #if defined __SUNPRO_CC #pragma disable_warn #elif defined _MSC_VER @@ -78,10 +80,44 @@ inline double normalize( double val ) return fabs(val) < 0.0000001 ? 0.0 : val; } -const char* escapeLineFeed( const char* pStr ) +namespace { - // TODO(Q3): Escape linefeeds - return pStr; + +/** Escapes line-ending characters (\n and \r) in input string. + */ +boost::shared_array lcl_escapeLineFeeds(const char* const i_pStr) +{ + size_t nLength(strlen(i_pStr)); + char* pBuffer = new char[2*nLength+1]; + + const char* pRead = i_pStr; + char* pWrite = pBuffer; + while( nLength-- ) + { + if( *pRead == '\r' ) + { + *pWrite++ = '\\'; + *pWrite++ = 'r'; + } + else if( *pRead == '\n' ) + { + *pWrite++ = '\\'; + *pWrite++ = 'n'; + } + else if( *pRead == '\\' ) + { + *pWrite++ = '\\'; + *pWrite++ = '\\'; + } + else + *pWrite++ = *pRead; + pRead++; + } + *pWrite++ = 0; + + return boost::shared_array(pBuffer); +} + } /// for the temp char buffer the header gets snprintfed in @@ -464,12 +500,14 @@ void PDFOutDev::processLink(Link* link, Catalog*) { const char* pURI = static_cast(pAction)->getURI()->getCString(); + boost::shared_array pEsc( lcl_escapeLineFeeds(pURI) ); + printf( "drawLink %f %f %f %f %s\n", normalize(x1), normalize(y1), normalize(x2), normalize(y2), - escapeLineFeed(pURI) ); + pEsc.get() ); } } @@ -634,6 +672,8 @@ void PDFOutDev::updateFont(GfxState *state) printf( " %lld", fontID ); aFont = it->second; + + boost::shared_array pEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); printf( " %d %d %d %d %f %d %s", aFont.isEmbedded, aFont.isBold, @@ -641,7 +681,7 @@ void PDFOutDev::updateFont(GfxState *state) aFont.isUnderline, normalize(state->getTransformedFontSize()), nEmbedSize, - escapeLineFeed(aFont.familyName.getCString()) ); + pEsc.get() ); } printf( "\n" ); @@ -765,7 +805,8 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, for( int i=0; imapUnicode(u[i], buf, sizeof(buf)-1) ] = 0; - printf( "%s", escapeLineFeed(buf) ); + boost::shared_array pEsc( lcl_escapeLineFeeds(buf) ); + printf( "%s", pEsc.get() ); } printf( "\n" ); diff --git a/swext/mediawiki/help/component.txt b/swext/mediawiki/help/component.txt index 8afa12126e03..c5ac1de36066 100755 --- a/swext/mediawiki/help/component.txt +++ b/swext/mediawiki/help/component.txt @@ -1,3 +1 @@ -The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers -without having to know the syntax of the MediaWiki markup language. Publish -your new and existing documents transparently with the Writer to a wiki page. +The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page. diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml index 2b90d149ae8a..30863c07e63c 100644 --- a/swext/mediawiki/src/description.xml +++ b/swext/mediawiki/src/description.xml @@ -1,6 +1,6 @@ - + @WIKIEXTENSIONPRODUCTNAME@ @@ -14,6 +14,6 @@ - Sun Microsystems + Oracle