[Libreoffice-commits] .: 3 commits - binfilter/bf_sw writerfilter/source writerperfect/source xmerge/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Feb 15 03:42:01 PST 2011
binfilter/bf_sw/source/core/inc/sectfrm.hxx | 2
binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 8 +
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 31 +++----
writerfilter/source/dmapper/ConversionHelper.cxx | 43 ----------
writerfilter/source/dmapper/ConversionHelper.hxx | 1
writerperfect/source/filter/DocumentCollector.cxx | 1
writerperfect/source/filter/FontStyle.cxx | 1
writerperfect/source/filter/OdgExporter.cxx | 1
xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java | 6 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java | 3
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java | 1
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java | 1
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java | 10 --
xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java | 19 ----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 6 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java | 1
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java | 7 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java | 17 ---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 22 -----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java | 6 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java | 3
24 files changed, 27 insertions(+), 169 deletions(-)
New commits:
commit 2f3478739d609038fa279ff51a566cb9bc0b70ee
Author: Bálint Dózsa <dozsabalint at gmail.com>
Date: Tue Feb 15 11:41:08 2011 +0000
Remove unused method
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 9d567f6..78930c4 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -512,49 +512,6 @@ sal_Int16 convertTableJustification( sal_Int32 nIntValue )
}
return nOrient;
}
-/*-- 06.08.2007 15:27:30---------------------------------------------------
- conversion form xsd::DateTime
- [-]CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm]
- -----------------------------------------------------------------------*/
-com::sun::star::util::DateTime convertDateTime( const ::rtl::OUString& rDateTimeString )
-{
- util::DateTime aRet( 0, 0, 0, 0, 1, 1, 1901 );
- //
- sal_Int32 nIndex = 0;
- ::rtl::OUString sDate( rDateTimeString.getToken( 0, 'T', nIndex ));
- sal_Int32 nDateIndex = 0;
- aRet.Year = (sal_uInt16)sDate.getToken( 0, '-', nDateIndex ).toInt32();
- if( nDateIndex > 0)
- aRet.Month = (sal_uInt16)sDate.getToken( 0, '-', nDateIndex ).toInt32();
- if( nDateIndex > 0)
- aRet.Day = (sal_uInt16)sDate.getToken( 0, '-', nDateIndex ).toInt32();
- ::rtl::OUString sTime;
- if(nIndex > 0)
- {
- sTime = ( rDateTimeString.getToken( 0, 'Z', nIndex ));
- sal_Int32 nTimeIndex = 0;
- aRet.Hours = (sal_uInt16)sTime.getToken( 0, ':', nTimeIndex ).toInt32();
- if( nTimeIndex > 0)
- aRet.Minutes = (sal_uInt16)sTime.getToken( 0, ':', nTimeIndex ).toInt32();
- if( nTimeIndex > 0)
- {
- ::rtl::OUString sSeconds = sTime.getToken( 0, ':', nTimeIndex );
- nTimeIndex = 0;
- aRet.Seconds = (sal_uInt16)sSeconds.getToken( 0, '.', nTimeIndex ).toInt32();
- aRet.HundredthSeconds = (sal_uInt16)sSeconds.getToken( 0, '.', nTimeIndex ).toInt32();
- }
-
-// todo: ignore time offset for a while - there's no time zone available
-// nIndex = 0;
-// ::rtl::OUString sOffset( rDateTimeString.getToken( 1, 'Z', nIndex ));
-// if( sOffset.getLength() )
-// {
-// add hour and minute offset and increase/decrease date if necessary
-// }
- }
- return aRet;
-}
-
sal_Int16 ConvertNumberingType(sal_Int32 nNFC)
{
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx b/writerfilter/source/dmapper/ConversionHelper.hxx
index a60a5f4..64b7d9e 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -57,7 +57,6 @@ namespace ConversionHelper{
sal_Int32 convertEMUToMM100(sal_Int32 _t);
sal_Int32 ConvertColor(sal_Int32 nWordColor );
sal_Int16 convertTableJustification( sal_Int32 nIntValue );
- ::com::sun::star::util::DateTime convertDateTime( const ::rtl::OUString& rDateTimeString );
sal_Int16 ConvertNumberingType(sal_Int32 nNFC);
} // namespace ConversionHelper
commit a9d0ba88a588d1893dc1aae853bc431639032a38
Author: Bálint Dózsa <dozsabalint at gmail.com>
Date: Tue Feb 15 11:34:08 2011 +0000
Remove dead codes
diff --git a/writerperfect/source/filter/DocumentCollector.cxx b/writerperfect/source/filter/DocumentCollector.cxx
index b4066e2..94b48bc 100644
--- a/writerperfect/source/filter/DocumentCollector.cxx
+++ b/writerperfect/source/filter/DocumentCollector.cxx
@@ -1018,7 +1018,6 @@ void DocumentCollector::openTableCell(const WPXPropertyList &propList)
if (propList["table:number-rows-spanned"])
pTableCellOpenElement->addAttribute("table:number-rows-spanned",
propList["table:number-rows-spanned"]->getStr().cstr());
- // pTableCellOpenElement->addAttribute("table:value-type", "string");
mpCurrentContentElements->push_back(pTableCellOpenElement);
mWriterDocumentStates.top().mbTableCellOpened = true;
diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/filter/FontStyle.cxx
index 07afe4b..c945407 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -44,7 +44,6 @@ void FontStyle::write(DocumentHandlerInterface *pHandler) const
TagOpenElement styleOpen("style:font-face");
styleOpen.addAttribute("style:name", getName());
styleOpen.addAttribute("svg:font-family", msFontFamily);
-// styleOpen.addAttribute("style:font-pitch", msFontPitch);
styleOpen.write(pHandler);
TagCloseElement styleClose("style:font-face");
styleClose.write(pHandler);
diff --git a/writerperfect/source/filter/OdgExporter.cxx b/writerperfect/source/filter/OdgExporter.cxx
index 03f75bb..c111cdb 100644
--- a/writerperfect/source/filter/OdgExporter.cxx
+++ b/writerperfect/source/filter/OdgExporter.cxx
@@ -196,7 +196,6 @@ void OdgExporter::endGraphics()
tmpStyleStyleOpenElement.write(mpHandler);
TagOpenElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
index d519758..e70327a 100644
--- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
+++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java
@@ -111,8 +111,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder {
Debug.log(Debug.ERROR, "MinicalcDecoder.constructor:" + e.getMessage());
throw new IOException(e.getMessage());
- // e.printStackTrace();
-
}
}
@@ -237,8 +235,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder {
Debug.log(Debug.ERROR, "MinicalcDecoder.setWorksheet:" + e.getMessage());
throw new IOException(e.getMessage());
- // e.printStackTrace();
-
}
}
@@ -286,8 +282,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder {
Debug.log(Debug.ERROR, "MinicalcDecoder.goToNextCell:" + e.getMessage());
throw new IOException(e.getMessage());
- // e.printStackTrace();
-
}
return gotCell;
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
index e5d74dc..19e68cf 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
@@ -57,7 +57,6 @@ public class BeginningOfFile implements BIFFRecord {
setSubStreamWBGlobal();
else
setSubStreamWorkSheet();
- // this.subStream = EndianConverter.writeShort(dt);
}
public BeginningOfFile(InputStream is) throws IOException {
@@ -73,12 +72,10 @@ public class BeginningOfFile implements BIFFRecord {
}
private void setSubStreamWBGlobal() {
- // subStream = new byte[] {0x05};
subStream = EndianConverter.writeShort((short) 0x05);
}
private void setSubStreamWorkSheet() {
- // subStream = new byte[] {0x10};
subStream = EndianConverter.writeShort((short) 0x10);
}
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java
index 6049b1d..e17bb12 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java
@@ -79,7 +79,6 @@ public class CodePage implements BIFFRecord {
int numOfBytesRead = input.read(codepage);
numOfBytesRead += input.read(unknown1);
numOfBytesRead += input.read(unknown2);
- // numOfBytesRead += input.read(unknown3);
unknown3 = (byte) input.read();
numOfBytesRead++;
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
index 61f5c8a..604ac73 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
@@ -154,7 +154,6 @@ public class FormulaCompiler {
bPop = false;
} else {
tmpTok = (Token)evalStack.pop();
- //if (!(isOpenBrace(tmpTok) || isParamDelimiter(tmpTok))) { //Don't output brackets and commas
if (!isParamDelimiter(tmpTok)) { //Don't output commas
rpnExpr.add(tmpTok);
}
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
index 0442a48..c48ec61 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
@@ -551,15 +551,5 @@ implements DOCConstants, OfficeConstants, DocumentDeserializer {
Debug.log(Debug.TRACE, str);
}
-
-
- /*
- public static void main(String args[]) {
-
- // DocumentDeserializerImpl d = new DocumentDeserializerImpl(new InputStream());
-
- Node nodes[] = parseText("Tab here:\tThen some more text");
- }
-*/
}
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
index 6d0e3cd..ed8036f 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java
@@ -260,31 +260,14 @@ class WsePara extends Wse {
temp = firstIndent / 1.6;
values[2] = (new Double(temp)).toString() + "mm";
-
-/* if ((lineSpace & LS_MULTIPLE) != 0) {
- temp = (lineSpace & LS_VALUEMASK) / 2;
- temp *= 100;
- values[3] = (new Double(temp)).toString() + "%";
- } else {
- values[3] = (new Double(temp)).toString() + "mm";
- // DJP: handle other cases
- }
-*/
+
temp = spaceBefore / 1.6;
-// values[4] = (new Double(temp)).toString() + "mm";
values[3] = (new Double(temp)).toString() + "mm";
temp = spaceAfter / 1.6;
-// values[5] = (new Double(temp)).toString() + "mm";
values[4] = (new Double(temp)).toString() + "mm";
switch (misc) {
-
-// case ALIGN_RIGHT: values[6] = "right"; break;
-// case ALIGN_LEFT: values[6] = "left"; break;
-// case ALIGN_CENTER:values[6] = "center"; break;
-// case ALIGN_JUST: values[6] = "justified"; break;
-
case ALIGN_RIGHT: values[5] = "right"; break;
case ALIGN_LEFT: values[5] = "left"; break;
case ALIGN_CENTER:values[5] = "center"; break;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index fe417fd..9d3edc1 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -202,7 +202,6 @@ public class DOMDocument
builder = factory.newDocumentBuilder();
} catch (ParserConfigurationException ex) {
System.out.println("Error:"+ ex);
- //throw new OfficeDocumentException(ex);
}
try {
@@ -211,7 +210,6 @@ public class DOMDocument
} catch (SAXException ex) {
System.out.println("Error:"+ ex);
- //throw new OfficeDocumentException(ex);
}
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index cda6dd0..77eaaf6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -531,13 +531,9 @@ public abstract class OfficeDocument
}
else{
try{
- //System.out.println("\nParsing Input stream, validating?: "+builder.isValidating());
- //contentDoc= builder.parse((InputStream)is);
-
Reader r = secondHack(is);
InputSource ins = new InputSource(r);
org.w3c.dom.Document newDoc = builder.parse(ins);
- //org.w3c.dom.Document newDoc = builder.parse((InputStream)is);
Element rootElement=newDoc.getDocumentElement();
NodeList nodeList;
@@ -829,13 +825,11 @@ public abstract class OfficeDocument
}
byte contentBytes[] = docToBytes(newDoc);
- //System.out.println(new String(contentBytes));
os.write(contentBytes);
}
catch(Exception exc){
System.out.println("\nException in OfficeDocument.write():" +exc);
}
- //byte contentBytes[] = docToBytes(contentDoc);
}
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 2006d75..e2f04b2 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -532,8 +532,6 @@ public class ParaStyle extends Style implements Cloneable {
for (int i = 0; i < NR_PROPERTIES; i++) {
if (ps.isSet[i]) {
- // if (!isSet[i]) return false;
-
if (i < NR_PROPERTIES - 1) {
// Compare the actual values. We allow a margin of error
// here because the conversion loses precision.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
index effbb55..2f3c27f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
@@ -289,7 +289,6 @@ public class StyleCatalog {
styleNode.setAttribute("style:family", s.getFamily());
Element propertiesNode = (Element) s.createNode(parentDoc, "style:properties");
- // if (propertiesNode.getFirstChild() != null)
// DJP: only add node if has children OR attributes
if (propertiesNode != null)
styleNode.appendChild(propertiesNode);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
index d32f82e..cccb028 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
@@ -651,10 +651,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
}
}
-
- // for (int j = 0; j < colsRepeated; j++) {
-
-
if (tableValueTypeNode != null) {
// Make sure we initialize to 0 the width of the current cell
@@ -858,7 +854,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
}
String s = buffer.toString();
- // displayWidth = calculateContentWidth(s);
addCell(s);
}
@@ -960,8 +955,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
String s = child.getNodeValue();
- // displayWidth = calculateContentWidth(s);
-
int k = s.lastIndexOf(".");
if (k > 0) {
s = s.substring(k+1);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index 1da5f0b..40332f4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -41,7 +41,6 @@ import org.openoffice.xmerge.ConvertData;
import org.openoffice.xmerge.ConvertException;
import org.openoffice.xmerge.DocumentDeserializer;
import org.openoffice.xmerge.converter.dom.DOMDocument;
-//import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;
import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument;
import org.openoffice.xmerge.util.Debug;
import org.openoffice.xmerge.util.registry.ConverterInfo;
@@ -50,7 +49,6 @@ import org.openoffice.xmerge.util.registry.ConverterInfo;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMSource;
-//import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.stream.StreamResult;
@@ -58,12 +56,6 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.URIResolver;
import javax.xml.transform.Source;
-
-//
-//import org.apache.xalan.serialize.Serializer;
-//import org.apache.xalan.serialize.SerializerFactory;
-//import org.apache.xalan.templates.OutputProperties;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -150,14 +142,12 @@ public final class DocumentDeserializerImpl
public Source resolve(String href,String base)
throws TransformerException{
- //System.out.println("\nhref "+href+"\nbase "+base);
if (href !=null){
if(href.equals("javax.xml.transform.dom.DOMSource")|| href.equals(""))
return null;
try{
ConverterInfo ci = pluginFactory.getConverterInfo();
String newhRef ="jar:"+ci.getJarName()+"!/"+href;
- //System.out.println("\n Looking For "+ newhRef);
StreamSource sheetFile= new StreamSource(newhRef);
return sheetFile;
}
@@ -215,13 +205,6 @@ public final class DocumentDeserializerImpl
tFactory.setURIResolver(this);
Transformer transformer = tFactory.newTransformer(xslDomSource);
transformer.transform(xmlDomSource,new StreamResult(baos));
- /*
- // Serialize for output to standard out
- Serializer serializer = SerializerFactory.getSerializer
- (OutputProperties.getDefaultMethodProperties("xml"));
- serializer.setOutputStream(System.out);
- serializer.asDOMSerializer().serialize(xmlDomResult.getNode());
- */
log("\n** Transform Complete ***");
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
index 07bb934..b98b18b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
@@ -197,14 +197,12 @@ public final class DocumentSerializerImpl
public Source resolve(String href,String base)
throws TransformerException{
- //System.out.println("\nhref "+href+"\nbase "+base);
if (href !=null){
if(href.equals("javax.xml.transform.dom.DOMSource")|| href.equals(""))
return null;
try{
ConverterInfo ci = pluginFactory.getConverterInfo();
String newhRef ="jar:"+ci.getJarName()+"!/"+href;
- //System.out.println("\n Looking For "+ newhRef);
StreamSource sheetFile= new StreamSource(newhRef);
return sheetFile;
}
@@ -235,9 +233,7 @@ public final class DocumentSerializerImpl
private ByteArrayOutputStream transform(org.w3c.dom.Document domDoc)
throws TransformerException,TransformerConfigurationException
, FileNotFoundException,IOException{
- //System.out.println("\nTransforming...");
ConverterInfo ci = pluginFactory.getConverterInfo();
- //DOMResult xmlDomResult = new DOMResult();
ByteArrayOutputStream baos= new ByteArrayOutputStream();
try{
@@ -255,8 +251,7 @@ public final class DocumentSerializerImpl
xslDoc= dBuilder.parse(ci.getXsltSerial());
}
- else{
- //System.out.println(ci.getJarName()+"!/"+ci.getXsltSerial());
+ else{
xslDoc = dBuilder.parse(
"jar:"+ci.getJarName()+"!/"+ci.getXsltSerial());
}
@@ -270,21 +265,6 @@ public final class DocumentSerializerImpl
Transformer transformer = tFactory.newTransformer(xslDomSource);
transformer.transform(xmlDomSource, new StreamResult(baos));
-
- /*
- transformer.transform(xmlDomSource, xmlDomResult); //Removed this impl because the DocType was not being written out
-
- // Serialize for output to standard out
- Serializer serializer = SerializerFactory.getSerializer
- (OutputProperties.getDefaultMethodProperties("xml"));
- //serializer.setOutputStream(System.out);
- serializer.setOutputStream(baos);
- serializer.asDOMSerializer().serialize(xmlDomResult.getNode());
- //serializer.asDOMSerializer().serialize(xmlDomSource.getNode());
-
-
- //System.out.println("\n** Transform Complete ***");
- */
}
catch(Exception e){
System.out.println("An error occurred in the transformation : "+e);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
index ec97743..1377d7b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -35,8 +35,6 @@ import org.openoffice.xmerge.DocumentDeserializer;
import org.openoffice.xmerge.DocumentDeserializerFactory;
import org.openoffice.xmerge.PluginFactory;
import org.openoffice.xmerge.converter.dom.DOMDocument;
-//import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;
-//import org.openoffice.xmerge.converter.xml.OfficeDocument;
import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument;
import org.openoffice.xmerge.util.registry.ConverterInfo;
import org.openoffice.xmerge.DocumentMerger;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
index 0c50750..171d6ae 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
@@ -63,16 +63,10 @@ public class CharArrayLCSAlgorithm {
// in those 2 sequences
diffTable = createDiffTable(orgSeq, modSeq);
- // debug purpose...
- // printDiffTable(diffTable);
-
Vector diffResult = new Vector();
generateResult(diffTable, orgSeqlen, modSeqlen, diffResult);
- // don't need anymore if Difference do not contain content information
- /* fillInDiffContent(diffResult, orgSeq, modSeq); */
-
Difference[] diffArray = new Difference[0];
// convert the vector to array, it has to do in here as
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index 2bf02bb..6f4184d 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -232,9 +232,6 @@ public class ConverterInfoReader {
desc, version, vendor,classImpl,
xsltSerial,xsltDeserial);
}
- /*ConverterInfo converterInfo = new ConverterInfo(jarfilename,
- officeMime, deviceMime, name, desc, version, vendor,
- classImpl);*/
converterInfoList.add(converterInfo);
}
commit c6a5e21bbb7d39bda7d394d53c176503c452cc49
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 15 09:51:09 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_sw/source/core/inc/sectfrm.hxx b/binfilter/bf_sw/source/core/inc/sectfrm.hxx
index 7ebc686..fd0ce90 100644
--- a/binfilter/bf_sw/source/core/inc/sectfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/sectfrm.hxx
@@ -59,7 +59,7 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
void CalcEndAtEndFlag();
protected:
virtual void MakeAll();
- virtual BOOL ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReformat ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
+ virtual BOOL ShouldBwdMoved( SwLayoutFrm *, BOOL, BOOL & ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
public:
SwSectionFrm( SwSection & ); //Inhalt wird nicht erzeugt!
diff --git a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
index 87dbd07..34e0fba 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
@@ -195,6 +195,9 @@ namespace binfilter {
/*?*/ case SVX_BREAK_PAGE_AFTER:
/*?*/ case SVX_BREAK_PAGE_BOTH:
/*?*/ bKeep = FALSE;
+/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ if ( bKeep )
/*N*/ {
@@ -225,6 +228,9 @@ namespace binfilter {
/*N*/ case SVX_BREAK_PAGE_BEFORE:
/*N*/ case SVX_BREAK_PAGE_BOTH:
/*N*/ bKeep = FALSE;
+/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ }
/*N*/ }
@@ -1016,6 +1022,8 @@ namespace binfilter {
/*?*/ if( pFly->IsFlyAtCntFrm() )
/*?*/ nAdd = ((SwFlyAtCntFrm*)pFly)->GetLastCharX();
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ nAdd += aHori.GetPos();
/*N*/ if( nAdd < pPreUp->Frm().Width() &&
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index 63a856e..b36689e 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -79,9 +79,9 @@ namespace binfilter {
/*N*/ SwFrm::SwFrm( SwModify *pMod ) :
/*N*/ SwClient( pMod ),
-/*N*/ pPrev( 0 ),
-/*N*/ pNext( 0 ),
/*N*/ pUpper( 0 ),
+/*N*/ pNext( 0 ),
+/*N*/ pPrev( 0 ),
/*N*/ pDrawObjs( 0 )
/*N*/ #ifdef DBG_UTIL
/*N*/ , nFrmId( SwFrm::nLastFrmId++ )
@@ -1481,8 +1481,8 @@ namespace binfilter {
/*N*/ nDist = LONG_MAX - nFrmHeight;
/*N*/
/*N*/ const bool bBrowse = GetUpper()->GetFmt()->GetDoc()->IsBrowseMode();
-/*N*/ const USHORT nType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body
-/*N*/ if( !(GetUpper()->GetType() & nType) && GetUpper()->HasFixSize() )
+/*N*/ const USHORT nLclType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body
+/*N*/ if( !(GetUpper()->GetType() & nLclType) && GetUpper()->HasFixSize() )
/*N*/ {
/*N*/ if ( !bTst )
/*N*/ {
@@ -1917,8 +1917,8 @@ namespace binfilter {
/*N*/ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*N*/ {
/*N*/ const bool bBrowse = GetFmt()->GetDoc()->IsBrowseMode();
-/*N*/ const USHORT nType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body
-/*N*/ if( !(GetType() & nType) && HasFixSize() )
+/*N*/ const USHORT nLclType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body
+/*N*/ if( !(GetType() & nLclType) && HasFixSize() )
/*N*/ return 0;
/*N*/
/*N*/ SWRECTFN( this )
@@ -2058,8 +2058,8 @@ namespace binfilter {
/*N*/ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*N*/ {
/*N*/ const bool bBrowse = GetFmt()->GetDoc()->IsBrowseMode();
-/*N*/ const USHORT nType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body
-/*N*/ if( !(GetType() & nType) && HasFixSize() )
+/*N*/ const USHORT nLclType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body
+/*N*/ if( !(GetType() & nLclType) && HasFixSize() )
/*N*/ return 0;
/*N*/
/*N*/ ASSERT( nDist >= 0, "nDist < 0" );
@@ -2423,12 +2423,12 @@ namespace binfilter {
/*N*/ {
/*N*/ // If lower isn't a table, row, cell or section frame, adjust its
/*N*/ // frame size.
-/*N*/ USHORT nType = pLowerFrm->GetType();
-/*N*/ if ( !(nType & (FRM_TAB|FRM_ROW|FRM_CELL|FRM_SECTION)) )
+/*N*/ USHORT nLclType = pLowerFrm->GetType();
+/*N*/ if ( !(nLclType & (FRM_TAB|FRM_ROW|FRM_CELL|FRM_SECTION)) )
/*N*/ {
/*N*/ if ( bWidthChgd )
/*N*/ {
-/*N*/ if( nType & nFixWidth )
+/*N*/ if( nLclType & nFixWidth )
/*N*/ {
/*N*/ // Considering previous conditions:
/*N*/ // In vertical layout set width of column, header and
@@ -2441,7 +2441,7 @@ namespace binfilter {
/*N*/ else if( rOldSize.Width() && !pLowerFrm->IsFtnFrm() )
/*N*/ {
/*N*/ // Adjust frame width proportional, if lower isn't a
-/*N*/ // foot note frame and condition <nType & nFixWidth>
+/*N*/ // foot note frame and condition <nLclType & nFixWidth>
/*N*/ // isn't true.
/*N*/ // Considering previous conditions:
/*N*/ // In vertical layout these are foot note container,
@@ -2470,7 +2470,7 @@ namespace binfilter {
/*N*/ }
/*N*/ if ( bHeightChgd )
/*N*/ {
-/*N*/ if( nType & nFixHeight )
+/*N*/ if( nLclType & nFixHeight )
/*N*/ {
/*N*/ // Considering previous conditions:
/*N*/ // In vertical layout set height of foot note and
@@ -2491,7 +2491,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // Adjust frame height proportional, if lower isn't a
/*N*/ // foot note, a header or a footer frame and
-/*N*/ // condition <nType & nFixHeight> isn't true.
+/*N*/ // condition <nLclType & nFixHeight> isn't true.
/*N*/ // Considering previous conditions:
/*N*/ // In vertical layout these are column, foot note container,
/*N*/ // body and no-text frames.
@@ -2599,7 +2599,7 @@ namespace binfilter {
/*N*/ // Finally adjust the columns if width is set to auto
/*N*/ // Possible optimisation: execute this code earlier in this function and
/*N*/ // return???
-/*N*/ if ( ( bVert && bHeightChgd || ! bVert && bWidthChgd ) &&
+/*N*/ if ( ( (bVert && bHeightChgd) || (!bVert && bWidthChgd) ) &&
/*N*/ Lower()->IsColumnFrm() )
/*N*/ {
/*N*/ // get column attribute
@@ -2790,6 +2790,7 @@ namespace binfilter {
/*N*/ long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, BOOL bWidth ) const
/*N*/ {
/*N*/ ASSERT( bWidth, "NonFlys, CalcRel: width only" );
+/*N*/ (void)bWidth;
/*N*/
/*N*/ long nRet = rSz.GetWidth(),
/*N*/ nPercent = rSz.GetWidthPercent();
More information about the Libreoffice-commits
mailing list