This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 585a789999 Fix typos (bitamps, binrary, betweeen), cleanup
585a789999 is described below
commit 585a78999909dc459bf73df17df32793da6d9163
Author: mseidel <[email protected]>
AuthorDate: Wed Feb 12 23:41:06 2025 +0100
Fix typos (bitamps, binrary, betweeen), cleanup
---
.../source/processor2d/hittestprocessor2d.cxx | 125 +++++++--------
.../java/OOoRunner/src/main/java/util/utils.java | 41 +++--
main/udkapi/com/sun/star/io/XInputStream.idl | 176 ++++++++++-----------
3 files changed, 168 insertions(+), 174 deletions(-)
diff --git a/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx
b/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index c9900f27b8..97fc85068a 100644
--- a/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
@@ -49,14 +47,14 @@ namespace drawinglayer
HitTestProcessor2D::HitTestProcessor2D(const
geometry::ViewInformation2D& rViewInformation,
const basegfx::B2DPoint& rLogicHitPosition,
double fLogicHitTolerance,
- bool bHitTextOnly)
+ bool bHitTextOnly)
: BaseProcessor2D(rViewInformation),
maDiscreteHitPosition(),
mfDiscreteHitTolerance(0.0),
mbHit(false),
mbHitToleranceUsed(false),
mbUseInvisiblePrimitiveContent(true),
- mbHitTextOnly(bHitTextOnly)
+ mbHitTextOnly(bHitTextOnly)
{
// init hit tolerance
mfDiscreteHitTolerance = fLogicHitTolerance;
@@ -69,11 +67,11 @@ namespace drawinglayer
else if(basegfx::fTools::more(mfDiscreteHitTolerance,
0.0))
{
// generate discrete hit tolerance
- mfDiscreteHitTolerance =
(getViewInformation2D().getObjectToViewTransformation()
+ mfDiscreteHitTolerance =
(getViewInformation2D().getObjectToViewTransformation()
*
basegfx::B2DVector(mfDiscreteHitTolerance, 0.0)).getLength();
}
- // gererate discrete hit position
+ // generate discrete hit position
maDiscreteHitPosition =
getViewInformation2D().getObjectToViewTransformation() * rLogicHitPosition;
// check if HitTolerance is used
@@ -104,8 +102,8 @@ namespace drawinglayer
{
// check if a polygon edge is hit
return basegfx::tools::isInEpsilonRange(
- aLocalPolygon,
- getDiscreteHitPosition(),
+ aLocalPolygon,
+ getDiscreteHitPosition(),
fDiscreteHitTolerance);
}
@@ -133,10 +131,10 @@ namespace drawinglayer
if(aPolygonRange.isInside(getDiscreteHitPosition()))
{
// if a HitTolerance is given, check for
polygon edge hit in epsilon first
- if(bDiscreteHitToleranceUsed &&
+ if(bDiscreteHitToleranceUsed &&
basegfx::tools::isInEpsilonRange(
- aLocalPolyPolygon,
- getDiscreteHitPosition(),
+ aLocalPolyPolygon,
+ getDiscreteHitPosition(),
fDiscreteHitTolerance))
{
bRetval = true;
@@ -158,23 +156,23 @@ namespace drawinglayer
void HitTestProcessor2D::check3DHit(const
primitive2d::ScenePrimitive2D& rCandidate)
{
// calculate relative point in unified 2D scene
- const basegfx::B2DPoint
aLogicHitPosition(getViewInformation2D().getInverseObjectToViewTransformation()
* getDiscreteHitPosition());
+ const basegfx::B2DPoint
aLogicHitPosition(getViewInformation2D().getInverseObjectToViewTransformation()
* getDiscreteHitPosition());
- // use bitmap check in ScenePrimitive2D
- bool bTryFastResult(false);
+ // use bitmap check in ScenePrimitive2D
+ bool bTryFastResult(false);
-
if(rCandidate.tryToCheckLastVisualisationDirectHit(aLogicHitPosition,
bTryFastResult))
- {
- mbHit = bTryFastResult;
- }
- else
- {
- basegfx::B2DHomMatrix
aInverseSceneTransform(rCandidate.getObjectTransformation());
- aInverseSceneTransform.invert();
- const basegfx::B2DPoint aRelativePoint(aInverseSceneTransform
* aLogicHitPosition);
+
if(rCandidate.tryToCheckLastVisualisationDirectHit(aLogicHitPosition,
bTryFastResult))
+ {
+ mbHit = bTryFastResult;
+ }
+ else
+ {
+ basegfx::B2DHomMatrix
aInverseSceneTransform(rCandidate.getObjectTransformation());
+ aInverseSceneTransform.invert();
+ const basegfx::B2DPoint
aRelativePoint(aInverseSceneTransform * aLogicHitPosition);
// check if test point is inside scene's unified area at all
- if(aRelativePoint.getX() >= 0.0 && aRelativePoint.getX() <=
1.0
+ if(aRelativePoint.getX() >= 0.0 && aRelativePoint.getX() <= 1.0
&& aRelativePoint.getY() >= 0.0 && aRelativePoint.getY()
<= 1.0)
{
// get 3D view information
@@ -205,9 +203,9 @@ namespace drawinglayer
{
// bound volumes hit, geometric cut tests
needed
drawinglayer::processor3d::CutFindProcessor aCutFindProcessor(
- rObjectViewInformation3D,
- aFront,
- aBack,
+ rObjectViewInformation3D,
+ aFront,
+ aBack,
true);
aCutFindProcessor.process(rPrimitives);
@@ -232,7 +230,7 @@ namespace drawinglayer
// process(xExtracted2DSceneShadow);
// }
// }
-
+
if(!getHit())
{
// empty 3D scene; Check for border hit
@@ -272,7 +270,7 @@ namespace drawinglayer
void HitTestProcessor2D::processBasePrimitive2D(const
primitive2d::BasePrimitive2D& rCandidate)
{
- if(getHit())
+ if(getHit())
{
// stop processing as soon as a hit was
recognized
return;
@@ -288,8 +286,8 @@ namespace drawinglayer
// create new local ViewInformation2D
containing transformation
const geometry::ViewInformation2D
aViewInformation2D(
-
getViewInformation2D().getObjectTransformation() *
rTransformCandidate.getTransformation(),
-
getViewInformation2D().getViewTransformation(),
+
getViewInformation2D().getObjectTransformation() *
rTransformCandidate.getTransformation(),
+
getViewInformation2D().getViewTransformation(),
getViewInformation2D().getViewport(),
getViewInformation2D().getVisualizedPage(),
getViewInformation2D().getViewTime(),
@@ -310,11 +308,11 @@ namespace drawinglayer
{
// create hairline in discrete
coordinates
const
primitive2d::PolygonHairlinePrimitive2D& rPolygonCandidate(static_cast< const
primitive2d::PolygonHairlinePrimitive2D& >(rCandidate));
-
+
// use hairline test
mbHit =
checkHairlineHitWithTolerance(rPolygonCandidate.getB2DPolygon(),
getDiscreteHitTolerance());
}
-
+
break;
}
case PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D :
@@ -323,11 +321,11 @@ namespace drawinglayer
{
// handle marker like hairline; no
need to decompose in dashes
const
primitive2d::PolygonMarkerPrimitive2D& rPolygonCandidate(static_cast< const
primitive2d::PolygonMarkerPrimitive2D& >(rCandidate));
-
+
// use hairline test
mbHit =
checkHairlineHitWithTolerance(rPolygonCandidate.getB2DPolygon(),
getDiscreteHitTolerance());
}
-
+
break;
}
case PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D :
@@ -349,10 +347,10 @@ namespace drawinglayer
else
{
// for all other
B2DLINEJOIN_* do a hairline HitTest with expanded tolerance
- const
basegfx::B2DVector
aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation()
+ const
basegfx::B2DVector
aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation()
*
basegfx::B2DVector(rLineAttribute.getWidth() * 0.5, 0.0));
mbHit =
checkHairlineHitWithTolerance(
-
rPolygonCandidate.getB2DPolygon(),
+
rPolygonCandidate.getB2DPolygon(),
getDiscreteHitTolerance() + aDiscreteHalfLineVector.getLength());
}
}
@@ -363,7 +361,7 @@ namespace drawinglayer
mbHit =
checkHairlineHitWithTolerance(rPolygonCandidate.getB2DPolygon(),
getDiscreteHitTolerance());
}
}
-
+
break;
}
case PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D :
@@ -373,7 +371,7 @@ namespace drawinglayer
// do not use decompose; just
handle like a line with width
const
primitive2d::PolygonWavePrimitive2D& rPolygonCandidate(static_cast< const
primitive2d::PolygonWavePrimitive2D& >(rCandidate));
double fLogicHitTolerance(0.0);
-
+
// if WaveHeight, grow by it
if(basegfx::fTools::more(rPolygonCandidate.getWaveHeight(), 0.0))
{
@@ -386,11 +384,11 @@ namespace drawinglayer
fLogicHitTolerance +=
rPolygonCandidate.getLineAttribute().getWidth() * 0.5;
}
- const basegfx::B2DVector
aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation()
+ const basegfx::B2DVector
aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation()
*
basegfx::B2DVector(fLogicHitTolerance, 0.0));
-
+
mbHit =
checkHairlineHitWithTolerance(
-
rPolygonCandidate.getB2DPolygon(),
+
rPolygonCandidate.getB2DPolygon(),
getDiscreteHitTolerance() +
aDiscreteHalfLineVector.getLength());
}
@@ -402,7 +400,7 @@ namespace drawinglayer
{
// create filled polyPolygon in
discrete coordinates
const
primitive2d::PolyPolygonColorPrimitive2D& rPolygonCandidate(static_cast< const
primitive2d::PolyPolygonColorPrimitive2D& >(rCandidate));
-
+
// use fill hit test
mbHit =
checkFillHitWithTolerance(rPolygonCandidate.getB2DPolyPolygon(),
getDiscreteHitTolerance());
}
@@ -418,7 +416,7 @@ namespace drawinglayer
// the children are recursively checked
for hit. This may be refined for
// parts where the content is
completely transparent if needed.
process(rTransCandidate.getChildren());
-
+
break;
}
case PRIMITIVE2D_ID_MASKPRIMITIVE2D :
@@ -426,7 +424,7 @@ namespace drawinglayer
// create mask in discrete coordinates;
only recursively continue
// with content when HitTest position
is inside the mask
const primitive2d::MaskPrimitive2D&
rMaskCandidate(static_cast< const primitive2d::MaskPrimitive2D& >(rCandidate));
-
+
// use fill hit test
if(checkFillHitWithTolerance(rMaskCandidate.getMask(),
getDiscreteHitTolerance()))
{
@@ -480,10 +478,10 @@ namespace drawinglayer
if(!getHitTextOnly())
{
// The recently added BitmapEx::GetTransparency()
makes it easy to extend
- // the BitmapPrimitive2D HitTest to take the contained
BotmapEx and it's
+ // the BitmapPrimitive2D HitTest to take the contained
BitmapEx and its
// transparency into account
const basegfx::B2DRange
aRange(rCandidate.getB2DRange(getViewInformation2D()));
-
+
if(!aRange.isEmpty())
{
const
primitive2d::BitmapPrimitive2D& rBitmapCandidate(static_cast< const
primitive2d::BitmapPrimitive2D& >(rCandidate));
@@ -493,10 +491,10 @@ namespace drawinglayer
if(rSizePixel.Width() && rSizePixel.Height())
{
basegfx::B2DHomMatrix aBackTransform(
-
getViewInformation2D().getObjectToViewTransformation() *
+
getViewInformation2D().getObjectToViewTransformation() *
rBitmapCandidate.getTransform());
aBackTransform.invert();
-
+
const basegfx::B2DPoint
aRelativePoint(aBackTransform * getDiscreteHitPosition());
const basegfx::B2DRange aUnitRange(0.0, 0.0,
1.0, 1.0);
@@ -532,10 +530,10 @@ namespace drawinglayer
// will be used for HitTest
currently.
//
// This may be refined in the
future, e.g:
- // - For Bitamps, the mask and/or
transparence information may be used
+ // - For Bitmaps, the mask and/or
transparence information may be used
// - For MetaFiles, the MetaFile
content may be used
const basegfx::B2DRange
aRange(rCandidate.getB2DRange(getViewInformation2D()));
-
+
if(!aRange.isEmpty())
{
const basegfx::B2DPolygon
aOutline(basegfx::tools::createPolygonFromRect(aRange));
@@ -547,7 +545,7 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D :
{
- // HiddenGeometryPrimitive2D; the
default decomposition would return an empty seqence,
+ // HiddenGeometryPrimitive2D; the
default decomposition would return an empty sequence,
// so force this primitive to process
it's children directly if the switch is set
// (which is the default). Else, ignore
invisible content
const
primitive2d::HiddenGeometryPrimitive2D& rHiddenGeometry(static_cast< const
primitive2d::HiddenGeometryPrimitive2D& >(rCandidate));
@@ -560,13 +558,13 @@ namespace drawinglayer
process(rChildren);
}
}
-
+
break;
}
case PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D :
{
- if(!getHitTextOnly())
- {
+ if(!getHitTextOnly())
+ {
const
primitive2d::PointArrayPrimitive2D& rPointArrayCandidate(static_cast< const
primitive2d::PointArrayPrimitive2D& >(rCandidate));
const std::vector<
basegfx::B2DPoint >& rPositions = rPointArrayCandidate.getPositions();
const sal_uInt32
nCount(rPositions.size());
@@ -581,15 +579,15 @@ namespace drawinglayer
mbHit = true;
}
}
- }
-
+ }
+
break;
}
default :
{
// process recursively
process(rCandidate.get2DDecomposition(getViewInformation2D()));
-
+
break;
}
}
@@ -598,5 +596,4 @@ namespace drawinglayer
} // end of namespace processor2d
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
b/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
index 1364d2f5e7..ad7ec2ce14 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/utils.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
package util;
import com.sun.star.frame.XController;
@@ -259,7 +258,7 @@ public class utils {
/**
*
- * This method get's the user dir of the connected office
+ * This method gets the user dir of the connected office
*
*/
public static String getOfficeUserPath(XMultiServiceFactory msf) {
@@ -286,12 +285,12 @@ public class utils {
}
/**
- * In the office there are some sttetings available. This function
+ * In the office there are some settings available. This function
* returns the value of the given setting name. For Example the setting
name "Temp"
* "Temp" returns the temp folder of the office instance.
* @param msf a XMultiServiceFactory
- * @param setting the name of the setting the value should be returned.
- * For example "Temp" reutrns the temp folder of the current office
instance.
+ * @param setting the name of the setting the value should be returned.
+ * For example "Temp" returns the temp folder of the current office
instance.
* @see com.sun.star.util.PathSettings
* @return the value as String
*/
@@ -337,7 +336,7 @@ public class utils {
}
/**
- * This method returns the temp dicrectory of the user.
+ * This method returns the temp directory of the user.
* Since Java 1.4 it is not possible to read environment variables. To
workaround
* this, the Java parameter -D could be used.
*/
@@ -359,7 +358,7 @@ public class utils {
/**
*
- * This method get's the temp dir of the connected office
+ * This method gets the temp dir of the connected office
*
*/
public static String getOfficeTemp(XMultiServiceFactory msf) {
@@ -373,7 +372,7 @@ public class utils {
}
/**
- * Gets StarOffice temp directory without 'file:///' prefix.
+ * Gets OpenOffice temp directory without 'file:///' prefix.
* For example is useful for Registry URL specifying.
* @msf Office factory for accessing its settings.
* @return SOffice temporary directory in form for example
@@ -407,8 +406,8 @@ public class utils {
}
/**
- * Gets StarOffice temp directory without 'file:///' prefix.
- * and System dependend file separator
+ * Gets OpenOffice temp directory without 'file:///' prefix.
+ * and System dependent file separator
*/
public static String getOfficeTempDirSys(XMultiServiceFactory msf) {
@@ -489,10 +488,10 @@ public class utils {
/**
* This method deletes via office the given file URL. It checks the
existence
- * of <CODE>fileURL</CODE>. If exists it will be deletet.
+ * of <CODE>fileURL</CODE>. If exists it will be deleted.
* @param xMsf the multiservice factory
* @param fileURL the file to delete
- * @return true if the file could be deletet or the file does not exist
+ * @return true if the file could be deleted or the file does not exist
*/
public static boolean deleteFile(XMultiServiceFactory xMsf, String
fileURL) {
boolean delete = true;
@@ -517,7 +516,7 @@ public class utils {
* This method copies via office a given file to a new one
* @param xMsf the multi service factory
* @param source the source file
- * @param destinaion the destination file
+ * @param destination the destination file
* @return true at success
*/
public static boolean copyFile(XMultiServiceFactory xMsf, String source,
String destinaion) {
@@ -709,9 +708,9 @@ public class utils {
}
/** returns the path to the office binary folder
- *
+ *
* @param msf The XMultiSeriveFactory
- * @return the path to the office binrary or an empty string on any error
+ * @return the path to the office binary or an empty string on any error
*/
public static String getOfficeBinPath(XMultiServiceFactory msf) {
String sysBinDir = "";
@@ -724,7 +723,7 @@ public class utils {
}
/**
- * Get an array of all property names from the property set. With the
include
+ * Get an array of all property names from the property set. With the
include
* and exclude parameters the properties can be filtered. <br>
* Set excludePropertyAttribute = 0 and includePropertyAttribute = 0
* to include all and exclude none.
@@ -997,7 +996,7 @@ public class utils {
/** returns a String which contains the current date and time<br>
* format: [DD.MM.YYYY - HH:MM:SS::mm]
- *
+ *
** @return a String which contains the current date and time
*/
public static String getDateTime() {
diff --git a/main/udkapi/com/sun/star/io/XInputStream.idl
b/main/udkapi/com/sun/star/io/XInputStream.idl
index 99eacae6c1..8b5d95897c 100644
--- a/main/udkapi/com/sun/star/io/XInputStream.idl
+++ b/main/udkapi/com/sun/star/io/XInputStream.idl
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,41 +7,39 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+#ifndef __com_sun_star_io_XInputStream_idl__
+#define __com_sun_star_io_XInputStream_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_io_NotConnectedException_idl__
+#include <com/sun/star/io/NotConnectedException.idl>
+#endif
+
+#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
+#include <com/sun/star/io/BufferSizeExceededException.idl>
+#endif
+
+//=============================================================================
+
+module com { module sun { module star { module io {
+
+//=============================================================================
-#ifndef __com_sun_star_io_XInputStream_idl__
-#define __com_sun_star_io_XInputStream_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_io_NotConnectedException_idl__
-#include <com/sun/star/io/NotConnectedException.idl>
-#endif
-
-#ifndef __com_sun_star_io_BufferSizeExceededException_idl__
-#include <com/sun/star/io/BufferSizeExceededException.idl>
-#endif
-
-
-//=============================================================================
-
-module com { module sun { module star { module io {
-
-//=============================================================================
-
// DocMerge from xml: interface com::sun::star::io::XInputStream
/** This is the basic interface to read data from a stream.
<p>
@@ -49,15 +47,15 @@ module com { module sun { module star { module io {
streaming document</a> for further information on chaining and piping
streams.
*/
published interface XInputStream: com::sun::star::uno::XInterface
-{
-
//-------------------------------------------------------------------------
-
+{
+
//-------------------------------------------------------------------------
+
// DocMerge from xml: method com::sun::star::io::XInputStream::readBytes
- /** reads the specified number of bytes in the given sequence.
-
- <p>The return value specifies the number of bytes which have
been
- put into the sequence. A difference between
<var>nBytesToRead</var>
- and the return value indicates that EOF has been reached. This
means
+ /** reads the specified number of bytes in the given sequence.
+
+ <p>The return value specifies the number of bytes which have
been
+ put into the sequence. A difference between
<var>nBytesToRead</var>
+ and the return value indicates that EOF has been reached. This
means
that the method blocks until the specified number of bytes are
available or the EOF is reached. </p>
@param aData
@@ -65,7 +63,7 @@ published interface XInputStream:
com::sun::star::uno::XInterface
of bytes (or less as a sign of EOF).
<p>
- C++ only : Note that for unbridged (e.g., in-process)
+ C++ only : Note that for unbridged (e.g., in-process)
calls, using the same sequence for repetive
readBytes()-calls
can bear a performance advantage. The callee can put
the data
directly into the sequence so that no buffer
reallocation is
@@ -77,31 +75,31 @@ published interface XInputStream:
com::sun::star::uno::XInterface
<li> the sequence is pre-allocated with the requested
number of bytes.
<li> the same sequence is reused ( simply
preallocationg a new
sequence for every call bears no advantage ).
- <li> the call is not bridged (e.g., betweeen
different compilers
+ <li> the call is not bridged (e.g., between different
compilers
or different processes ).
</ol>
If the same 'optimized' code runs against an interface
in a different process,
there is an unnecessary memory allocation/deallocation
(the out parameter
is of course NOT transported over the connection), but
this should
- be negligible compared to a synchron call.
+ be negligible compared to a synchronous call.
@param nBytesToRead
the total number of bytes to read
*/
- long readBytes( [out] sequence<byte> aData,
- [in] long nBytesToRead )
- raises( com::sun::star::io::NotConnectedException,
-
com::sun::star::io::BufferSizeExceededException,
- com::sun::star::io::IOException);
-
-
//-------------------------------------------------------------------------
-
+ long readBytes( [out] sequence<byte> aData,
+ [in] long nBytesToRead )
+ raises( com::sun::star::io::NotConnectedException,
+
com::sun::star::io::BufferSizeExceededException,
+ com::sun::star::io::IOException);
+
+
//-------------------------------------------------------------------------
+
// DocMerge from xml: method
com::sun::star::io::XInputStream::readSomeBytes
/** reads the available number of bytes, at maximum
- <var>nMaxBytesToRead</var>.
-
+ <var>nMaxBytesToRead</var>.
+
<p>This method is very similar to the readBytes method, except
that
- it has different blocking behaviour.
+ it has different blocking behavior.
The method blocks as long as at least 1 byte is available or
EOF has been reached. EOF has only been reached, when the method
returns 0 and the corresponding byte sequence is empty.
@@ -112,62 +110,62 @@ published interface XInputStream:
com::sun::star::uno::XInterface
stream during the call.
@see com::sun::star::io::XInputStream::readBytes
*/
- long readSomeBytes( [out] sequence<byte> aData,
- [in] long nMaxBytesToRead )
- raises( com::sun::star::io::NotConnectedException,
-
com::sun::star::io::BufferSizeExceededException,
- com::sun::star::io::IOException );
-
-
//-------------------------------------------------------------------------
-
+ long readSomeBytes( [out] sequence<byte> aData,
+ [in] long nMaxBytesToRead )
+ raises( com::sun::star::io::NotConnectedException,
+
com::sun::star::io::BufferSizeExceededException,
+ com::sun::star::io::IOException );
+
+
//-------------------------------------------------------------------------
+
// DocMerge from xml: method com::sun::star::io::XInputStream::skipBytes
- /** skips the next <var>nBytesToSkip</var> bytes (must be positive).
-
+ /** skips the next <var>nBytesToSkip</var> bytes (must be positive).
+
<p>It is up to the implementation whether this method is
blocking the thread or not. </p>
@param nBytesToSkip
number of bytes to skip
*/
- void skipBytes( [in] long nBytesToSkip )
- raises( com::sun::star::io::NotConnectedException,
-
com::sun::star::io::BufferSizeExceededException,
- com::sun::star::io::IOException );
-
-
//-------------------------------------------------------------------------
-
+ void skipBytes( [in] long nBytesToSkip )
+ raises( com::sun::star::io::NotConnectedException,
+
com::sun::star::io::BufferSizeExceededException,
+ com::sun::star::io::IOException );
+
+
//-------------------------------------------------------------------------
+
// DocMerge from xml: method com::sun::star::io::XInputStream::available
- /** states how many bytes can be read or skipped without blocking.
-
+ /** states how many bytes can be read or skipped without blocking.
+
<p>Note: This method offers no information on whether the EOF
has been reached. </p>
*/
- long available()
- raises( com::sun::star::io::NotConnectedException,
- com::sun::star::io::IOException
- );
-
-
//-------------------------------------------------------------------------
-
+ long available()
+ raises( com::sun::star::io::NotConnectedException,
+ com::sun::star::io::IOException
+ );
+
+
//-------------------------------------------------------------------------
+
// DocMerge from xml: method
com::sun::star::io::XInputStream::closeInput
- /** closes the stream.
-
+ /** closes the stream.
+
<p>Users must close the stream explicitly when no further
reading should be done. (There may exist ring references to
chained objects that can only be released during this call.
Thus not calling this method would result in a leak of memory or
external resources.) </p>
*/
- void closeInput()
- raises( com::sun::star::io::NotConnectedException,
- com::sun::star::io::IOException);
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-/*=============================================================================
-
-=============================================================================*/
+ void closeInput()
+ raises( com::sun::star::io::NotConnectedException,
+ com::sun::star::io::IOException);
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
#endif
