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 1177456 Fixed links to Wiki, removed whitespace
1177456 is described below
commit 117745656802a102d5ce885c006f2d3a8fa4022f
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Apr 13 13:56:10 2021 +0200
Fixed links to Wiki, removed whitespace
---
main/cppu/inc/uno/Enterable.h | 61 +++++------
main/cppu/inc/uno/EnvDcp.h | 21 ++--
main/cppu/inc/uno/mapping.hxx | 82 +++++++-------
.../helpcontent2/source/text/scalc/01/04060107.xhp | 19 ++--
.../source/text/shared/01/06040400.xhp | 11 +-
main/i18npool/source/paper/paper.cxx | 4 +-
main/i18nutil/source/utility/widthfolding.cxx | 21 ++--
.../FlatXmlFilter_java/FlatXml.java | 103 +++++++++---------
.../com/sun/star/report/XReportControlModel.idl | 119 +++++++++++----------
.../openoffice/Office/OOoImprovement/Settings.xcs | 12 +--
10 files changed, 230 insertions(+), 223 deletions(-)
diff --git a/main/cppu/inc/uno/Enterable.h b/main/cppu/inc/uno/Enterable.h
index e7f9de0..2c64ae4 100644
--- a/main/cppu/inc/uno/Enterable.h
+++ b/main/cppu/inc/uno/Enterable.h
@@ -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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -34,70 +34,70 @@ extern "C"
/** Generic function type declaration for entering an Environment.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
+
@param context
- @since UDK 3.2.7
+ @since UDK 3.2.7
*/
typedef void uno_Enterable_enter (void * context);
/** Generic function type declaration for levaing an Environment.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
+
@param context
- @since UDK 3.2.7
+ @since UDK 3.2.7
*/
typedef void uno_Enterable_leave (void * context);
/** Generic function type declaration for calling into an Environment.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
+
@param context
- @param pCallee the function to be called
- @param pParam the parameter pointer to be passed to the function
- @since UDK 3.2.7
+ @param pCallee the function to be called
+ @param pParam the parameter pointer to be passed to the function
+ @since UDK 3.2.7
*/
typedef void uno_Enterable_callInto_v(void * context, uno_EnvCallee * pCallee,
va_list * pParam);
/** Generic function type declaration for calling out of an Environment.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
+
@param context
- @param pCallee the function to be called
- @param pParam the parameter pointer to be passed to the function
- @since UDK 3.2.7
+ @param pCallee the function to be called
+ @param pParam the parameter pointer to be passed to the function
+ @since UDK 3.2.7
*/
typedef void uno_Enterable_callOut_v (void * context, uno_EnvCallee * pCallee,
va_list * pParam);
/** Generic function type declaration for checking if calling on managed
object is
- valid.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
-
+ valid.
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
+
@param context
- @param ppReason the reason, in case calling is not valid
- @return 0 == calling is not valid, 1 == calling is valid
- @since UDK 3.2.7
+ @param ppReason the reason, in case calling is not valid
+ @return 0 == calling is not valid, 1 == calling is valid
+ @since UDK 3.2.7
*/
typedef int uno_Enterable_isValid_v (void * context, rtl_uString ** ppReason);
/** A struct pReserved needs to point to, if implementing a purpose
environment.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Stack)
- @since UDK 3.2.7
+ @since UDK 3.2.7
*/
-typedef struct
+typedef struct
{
uno_Enterable_enter * m_enter;
uno_Enterable_leave * m_leave;
uno_Enterable_callInto_v * m_callInto_v;
uno_Enterable_callOut_v * m_callOut_v;
uno_Enterable_isValid_v * m_isValid;
-}
+}
uno_Enterable;
@@ -106,3 +106,4 @@ uno_Enterable;
#endif
#endif
+
diff --git a/main/cppu/inc/uno/EnvDcp.h b/main/cppu/inc/uno/EnvDcp.h
index 6d39ce5..eacda01 100644
--- a/main/cppu/inc/uno/EnvDcp.h
+++ b/main/cppu/inc/uno/EnvDcp.h
@@ -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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -32,21 +32,21 @@ extern "C"
#endif
/** Get the OBI type part of an environment descriptor.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor)
-
+
(https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor)
+
@param pEnvDcp the Environment Descriptor
@param ppEnvTypeName the OBI type
- @since UDK 3.2.7
+ @since UDK 3.2.7
*/
void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString **
ppEnvTypeName);
/** Get the purpose part of an environment descriptor.
-
(http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor)
-
+
(https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Environment_Descriptor)
+
@param pEnvDcp the Environment Descriptor
@param ppEnvPurpose the purpose
- @since UDK 3.2.7
+ @since UDK 3.2.7
*/
void uno_EnvDcp_getPurpose (rtl_uString const * pEnvDcp, rtl_uString **
ppEnvPurpose);
@@ -57,3 +57,4 @@ void uno_EnvDcp_getPurpose (rtl_uString const * pEnvDcp,
rtl_uString ** ppEnvPur
#endif
+
diff --git a/main/cppu/inc/uno/mapping.hxx b/main/cppu/inc/uno/mapping.hxx
index 59382ef..ae19432 100644
--- a/main/cppu/inc/uno/mapping.hxx
+++ b/main/cppu/inc/uno/mapping.hxx
@@ -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,20 @@
* 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 _UNO_MAPPING_HXX_
#define _UNO_MAPPING_HXX_
@@ -37,11 +38,11 @@ typedef struct _typelib_InterfaceTypeDescription
typelib_InterfaceTypeDescriptio
typedef struct _uno_Interface uno_Interface;
namespace com
-{
+{
namespace sun
-{
+{
namespace star
-{
+{
namespace uno
{
@@ -52,7 +53,7 @@ namespace uno
class Mapping
{
uno_Mapping * _pMapping;
-
+
public:
// these are here to force memory de/allocation to sal lib.
/** @internal */
@@ -67,10 +68,10 @@ public:
/** @internal */
inline static void SAL_CALL operator delete ( void *, void * )
SAL_THROW( () )
{}
-
+
/** Holds a mapping from the specified source to the specified
destination by environment
type names.
-
+
@param rFrom type name of source environment
@param rTo type name of destination
environment
@param rAddPurpose additional purpose
@@ -79,9 +80,9 @@ public:
const ::rtl::OUString & rFrom, const ::rtl::OUString & rTo,
const ::rtl::OUString & rAddPurpose = ::rtl::OUString() )
SAL_THROW( () );
-
+
/** Holds a mapping from the specified source to the specified
destination.
-
+
@param pFrom source environment
@param pTo destination environment
@param rAddPurpose additional purpose
@@ -90,7 +91,7 @@ public:
uno_Environment * pFrom, uno_Environment * pTo,
const ::rtl::OUString & rAddPurpose = ::rtl::OUString() )
SAL_THROW( () );
-
+
/** Holds a mapping from the specified source to the specified
destination
environment.
@@ -103,80 +104,80 @@ public:
SAL_THROW( () );
/** Constructor.
-
+
@param pMapping another mapping
*/
inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () );
-
+
/** Copy constructor.
-
+
@param rMapping another mapping
*/
inline Mapping( const Mapping & rMapping ) SAL_THROW( () );
-
+
/** Destructor.
*/
inline ~Mapping() SAL_THROW( () );
-
+
/** Sets a given mapping.
-
+
@param pMapping another mapping
@return this mapping
*/
inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping )
SAL_THROW( () );
/** Sets a given mapping.
-
+
@param rMapping another mapping
@return this mapping
*/
inline Mapping & SAL_CALL operator = ( const Mapping & rMapping )
SAL_THROW( () )
{ return operator = ( rMapping._pMapping ); }
-
+
/** Provides a pointer to the C mapping. The returned mapping is NOT
acquired!
-
+
@return UNacquired C mapping
*/
inline uno_Mapping * SAL_CALL get() const SAL_THROW( () )
{ return _pMapping; }
-
+
/** Tests if a mapping is set.
-
+
@return true if a mapping is set
*/
inline sal_Bool SAL_CALL is() const SAL_THROW( () )
{ return (_pMapping != 0); }
-
+
/** Releases a set mapping.
*/
inline void SAL_CALL clear() SAL_THROW( () );
-
+
/** Maps an interface from one environment to another.
-
+
@param pInterface source interface
@param pTypeDescr type description of interface
@return mapped interface
*/
inline void * SAL_CALL mapInterface( void * pInterface,
typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW( () );
/** Maps an interface from one environment to another.
-
+
@param pInterface source interface
@param pTypeDescr type description of interface
@return mapped interface
*/
inline void * SAL_CALL mapInterface( void * pInterface,
typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () )
{ return mapInterface( pInterface,
(typelib_InterfaceTypeDescription *)pTypeDescr ); }
-
+
/** Maps an interface from one environment to another.
-
+
@param pInterface source interface
@param rType type of interface
@return mapped interface
*/
inline void * SAL_CALL mapInterface(
void * pInterface, const ::com::sun::star::uno::Type & rType )
const SAL_THROW( () );
-
+
/** Maps an interface from one environment to another.
-
+
@param ppOut inout mapped interface
@param pInterface source interface
@param pTypeDescr type description of interface
@@ -184,16 +185,16 @@ public:
inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface,
typelib_InterfaceTypeDescription * pTypeDescr ) const SAL_THROW( () )
{ (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface,
pTypeDescr ); }
/** Maps an interface from one environment to another.
-
+
@param ppOut inout mapped interface
@param pInterface source interface
@param pTypeDescr type description of interface
*/
inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface,
typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () )
{ (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface,
(typelib_InterfaceTypeDescription *)pTypeDescr ); }
-
+
/** Maps an interface from one environment to another.
-
+
@param ppOut inout mapped interface
@param pInterface source interface
@param rType type of interface to be mapped
@@ -296,10 +297,10 @@ inline void * Mapping::mapInterface(
}
/** Deprecated. This function DOES NOT WORK with Purpose Environments
- (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Purpose
Environments)
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Purpose Environments)
+
+ Maps a binary C UNO interface to be used in the currently used compiler
environment.
- Maps an binary C UNO interface to be used in the currently used compiler
environment.
-
@tplparam C interface type
@param ppRet inout returned interface pointer
@param pUnoI binary C UNO interface
@@ -319,10 +320,10 @@ inline sal_Bool mapToCpp( Reference< C > * ppRet,
uno_Interface * pUnoI ) SAL_TH
return (0 != *ppRet);
}
/** Deprecated. This function DOES NOT WORK with Purpose Environments
- (http://wiki.services.openoffice.org/wiki/Uno/Binary/Spec/Purpose
Environments)
+ (https://wiki.openoffice.org/wiki/Uno/Binary/Spec/Purpose Environments)
Maps an UNO interface of the currently used compiler environment to binary
C UNO.
-
+
@tplparam C interface type
@param ppRet inout returned interface pointer
@param x interface reference
@@ -348,3 +349,4 @@ inline sal_Bool mapToUno( uno_Interface ** ppRet, const
Reference< C > & x ) SAL
}
#endif
+
diff --git a/main/helpcontent2/source/text/scalc/01/04060107.xhp
b/main/helpcontent2/source/text/scalc/01/04060107.xhp
index 32cf1be..eedc267 100644
--- a/main/helpcontent2/source/text/scalc/01/04060107.xhp
+++ b/main/helpcontent2/source/text/scalc/01/04060107.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--***********************************************************
- *
+ *
* 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
@@ -10,21 +10,20 @@
* 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.
- *
+ *
***********************************************************-->
-
-
+
<meta>
<topic id="textscalc0104060107xml" indexer="include">
<title id="tit" xml-lang="en-US">Array Functions</title>
@@ -48,10 +47,10 @@
<bookmark_value>forced array handling</bookmark_value>
</bookmark><comment>mw deleted "creating;"</comment>
<paragraph role="heading" id="hd_id3147273" xml-lang="en-US" level="1"
l10n="U" oldref="1">Array Functions</paragraph>
-<paragraph role="paragraph" id="par_id3154744" xml-lang="en-US" l10n="U"
oldref="2"><variable id="matrixtext">This category contains the array
functions.
+<paragraph role="paragraph" id="par_id3154744" xml-lang="en-US" l10n="U"
oldref="2"><variable id="matrixtext">This category contains the array functions.
</variable></paragraph>
<paragraph role="heading" id="hd_id3146084" xml-lang="en-US" level="2"
l10n="U" oldref="257">What is an Array?</paragraph>
-<paragraph role="paragraph" id="par_id3154298" xml-lang="en-US" l10n="U"
oldref="258"><variable id="wasmatrix">An array is a linked range of cells on a
spreadsheet containing values.
+<paragraph role="paragraph" id="par_id3154298" xml-lang="en-US" l10n="U"
oldref="258"><variable id="wasmatrix">An array is a linked range of cells on a
spreadsheet containing values.
</variable> A square range of 3 rows and 3 columns is a 3 x 3
array:</paragraph>
<table id="tbl_id3151168">
<tablerow>
@@ -651,7 +650,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_RGP" id="bm_id3144716"
localize="false"/>
<paragraph role="heading" id="hd_id3109846" xml-lang="en-US" level="2"
l10n="U" oldref="64">LINEST</paragraph>
-<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="CHG"
oldref="65"><ahelp hid="HID_FUNC_RGP">Returns a table of statistics for a
straight line that best fits a data set.</ahelp><comment>changed based on
http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_LINEST_function
(issue 76142)</comment></paragraph>
+<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="CHG"
oldref="65"><ahelp hid="HID_FUNC_RGP">Returns a table of statistics for a
straight line that best fits a data set.</ahelp><comment>changed based on
https://wiki.openoffice.org/wiki/Documentation/How_Tos/Calc:_LINEST_function
(issue 76142)</comment></paragraph>
<paragraph role="heading" id="hd_id3152825" xml-lang="en-US" level="3"
l10n="U" oldref="66">Syntax</paragraph>
<paragraph role="code" id="par_id3152839" xml-lang="en-US" l10n="U"
oldref="67">LINEST(data_Y; data_X; linearType; stats)</paragraph>
<paragraph role="paragraph" id="par_id3152853" xml-lang="en-US" l10n="U"
oldref="68">
diff --git a/main/helpcontent2/source/text/shared/01/06040400.xhp
b/main/helpcontent2/source/text/shared/01/06040400.xhp
index 921f9bf..e9e16ca 100644
--- a/main/helpcontent2/source/text/shared/01/06040400.xhp
+++ b/main/helpcontent2/source/text/shared/01/06040400.xhp
@@ -2,7 +2,7 @@
<helpdocument version="1.0">
<!--***********************************************************
- *
+ *
* 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
@@ -10,21 +10,20 @@
* 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.
- *
+ *
***********************************************************-->
-
<meta>
<topic id="textshared0106040400xml" indexer="include">
<title id="tit" xml-lang="en-US">Localized Options</title>
@@ -49,7 +48,7 @@
<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFAPAGE_QUOTE_SW_CLB"
id="bm_id59906552" localize="false"/>
<paragraph xml-lang="en-US" id="par_id31537173" role="paragraph"
l10n="NEW"><ahelp hid=".">Select to apply the replacements while you type [T],
or when you modify existing text [M].</ahelp></paragraph>
-<comment>new feature, cws cbosdo01.
http://wiki.services.openoffice.org/wiki/Non_Breaking_Spaces_Before_Punctuation_In_French_(espaces_ins%C3%A9cables)</comment>
+<comment>new feature, cws cbosdo01.
https://wiki.openoffice.org/wiki/Non_Breaking_Spaces_Before_Punctuation_In_French_(espaces_ins%C3%A9cables)</comment>
<paragraph xml-lang="en-US" id="hd_id3159300" role="heading" level="2"
l10n="U" oldref="25">Add non breaking space before specific punctuation marks
in French text</paragraph>
<paragraph xml-lang="en-US" id="par_id3153173" role="paragraph" l10n="U"
oldref="27">Inserts a non breaking space before ";", "!", "?" and ":" when the
character language is set to French (France, Belgium, Luxembourg, Monaco, or
Switzerland) and before ":" only when the character language is set to French
(Canada).</paragraph>
diff --git a/main/i18npool/source/paper/paper.cxx
b/main/i18npool/source/paper/paper.cxx
index 6532300..3a6cdbc 100644
--- a/main/i18npool/source/paper/paper.cxx
+++ b/main/i18npool/source/paper/paper.cxx
@@ -437,10 +437,10 @@ Paper PaperInfo::fromPSName(const rtl::OString &rName)
return PAPER_USER;
}
-//http://wiki.services.openoffice.org/wiki/DefaultPaperSize
+//https://wiki.openoffice.org/wiki/DefaultPaperSize
//http://www.unicode.org/cldr/data/charts/supplemental/territory_language_information.html
//http://sourceware.org/git/?p=glibc.git;a=tree;f=localedata/locales
-//http://en.wikipedia.org/wiki/Paper_size
+//https://en.wikipedia.org/wiki/Paper_size
//http://msdn.microsoft.com/en-us/library/cc195164.aspx
PaperInfo PaperInfo::getDefaultPaperForLocale(
const ::com::sun::star::lang::Locale & rLocale)
diff --git a/main/i18nutil/source/utility/widthfolding.cxx
b/main/i18nutil/source/utility/widthfolding.cxx
index c48395b..7578801 100644
--- a/main/i18nutil/source/utility/widthfolding.cxx
+++ b/main/i18nutil/source/utility/widthfolding.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -63,7 +63,7 @@ OUString widthfolding::decompose_ja_voiced_sound_marks (const
OUString& inStr, s
// Prepare pointers of unicode character arrays.
const sal_Unicode* src = inStr.getStr() + startPos;
sal_Unicode* dst = newStr->buffer;
-
+
// Decomposition: GA --> KA + voice-mark
while (nCount -- > 0) {
sal_Unicode c = *src++;
@@ -137,7 +137,7 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const
OUString& inStr, sal
position = startPos;
}
- //
+ //
sal_Unicode previousChar = *src ++;
sal_Unicode currentChar;
@@ -173,7 +173,7 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const
OUString& inStr, sal
position ++;
*p ++ = position ++;
}
- *dst ++ = composition_table[i][j];
+ *dst ++ = composition_table[i][j];
previousChar = *src ++;
nCount --;
continue;
@@ -220,10 +220,10 @@ oneToOneMapping& widthfolding::getfull2halfTableForASC()
// bluedwarf: dirty hack!
// There is an exception. Additional conversion is required following:
- // 0xFFE5 (FULLWIDTH YEN SIGN) --> 0x005C (REVERSE SOLIDUS)
+ // 0xFFE5 (FULLWIDTH YEN SIGN) --> 0x005C (REVERSE SOLIDUS)
//
// See the following page for detail:
- //
http://wiki.services.openoffice.org/wiki/Calc/Features/JIS_and_ASC_functions
+ // https://wiki.openoffice.org/wiki/Calc/Features/JIS_and_ASC_functions
int i, j, high, low;
int n = sizeof(full2halfASCException) / sizeof(UnicodePairWithFlag);
for( i = 0; i < n; i++ )
@@ -257,7 +257,7 @@ oneToOneMapping& widthfolding::gethalf2fullTableForJIS()
// 0x0060 (GRAVE ACCENT) --> 0x2018 (LEFT SINGLE QUOTATION MARK)
//
// See the following page for detail:
- //
http://wiki.services.openoffice.org/wiki/Calc/Features/JIS_and_ASC_functions
+ // https://wiki.openoffice.org/wiki/Calc/Features/JIS_and_ASC_functions
int i, j, high, low;
int n = sizeof(half2fullJISException) / sizeof(UnicodePairWithFlag);
for( i = 0; i < n; i++ )
@@ -293,3 +293,4 @@ oneToOneMapping& widthfolding::gethalfKana2fullKanaTable()
}
} } } }
+
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
index d1623b1..85cbafc 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -39,8 +39,8 @@ import com.sun.star.io.XActiveDataSource;
-public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
- XServiceInfo, XDocumentHandler, XTypeProvider
+public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
+ XServiceInfo, XDocumentHandler, XTypeProvider
{
/*
@@ -55,15 +55,15 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
static private final String[] __supportedServiceNames = {
"devguide.officedev.samples.filter.FlatXmlJava"
};
-
+
public FlatXml(XMultiServiceFactory f) {
m_xServiceFactory = f;
}
-
+
// --- XTypeProvider ---
public byte[] getImplementationId() {
return Integer.toString(this.hashCode()).getBytes();
- }
+ }
// --- XServiceName ---
public String getServiceName() {
@@ -80,10 +80,10 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
public String getImplementationName() {
return( this.getClass().getName() );
}
- public String[] getSupportedServiceNames() {
+ public String[] getSupportedServiceNames() {
return( __supportedServiceNames );
}
-
+
public com.sun.star.uno.Type[] getTypes() {
Type[] typeReturn = {};
try {
@@ -92,7 +92,7 @@ public class FlatXml implements XImportFilter, XExportFilter,
XServiceName,
new Type( XExportFilter.class ),
new Type( XImportFilter.class ),
new Type( XServiceName.class ),
- new Type( XServiceInfo.class )
+ new Type( XServiceInfo.class )
};
} catch( java.lang.Exception exception ) {
return null;
@@ -100,19 +100,19 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
return( typeReturn );
}
- public boolean importer(PropertyValue[] aSourceData, XDocumentHandler
xDocHandler, String[] msUserData)
- throws com.sun.star.uno.RuntimeException,
com.sun.star.lang.IllegalArgumentException
- {
+ public boolean importer(PropertyValue[] aSourceData, XDocumentHandler
xDocHandler, String[] msUserData)
+ throws com.sun.star.uno.RuntimeException,
com.sun.star.lang.IllegalArgumentException
+ {
String sName = null;
String sFileName = null;
- String sURL = null;
- com.sun.star.io.XInputStream xin = null;
+ String sURL = null;
+ com.sun.star.io.XInputStream xin = null;
try {
-
- for (int i = 0 ; i < aSourceData.length; i++)
+
+ for (int i = 0 ; i < aSourceData.length; i++)
{
- sName = aSourceData[i].Name;
+ sName = aSourceData[i].Name;
if (sName.equals("InputStream"))
xin =
(XInputStream)AnyConverter.toObject(XInputStream.class, aSourceData[i].Value);
if (sName.equals("URL"))
@@ -120,48 +120,48 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
if (sName.equals("FileName"))
sFileName=(String)AnyConverter.toObject(String.class, aSourceData[i].Value);
}
-
+
Object
tmpObj=m_xServiceFactory.createInstance("com.sun.star.xml.sax.Parser");
if (tmpObj == null) return false;
-
+
XParser xParser =
(XParser)UnoRuntime.queryInterface(XParser.class , tmpObj);
if (xParser == null) return false;
-
+
InputSource aInput = new InputSource();
aInput.sSystemId = sURL;
aInput.aInputStream =xin;
xParser.setDocumentHandler ( xDocHandler );
- xParser.parseStream ( aInput );
+ xParser.parseStream ( aInput );
} catch (com.sun.star.uno.Exception e){
- e.printStackTrace();
+ e.printStackTrace();
return false;
}
-
+
// done...
return true;
}
- public boolean exporter(PropertyValue[] aSourceData, String[] msUserData)
+ public boolean exporter(PropertyValue[] aSourceData, String[] msUserData)
throws com.sun.star.uno.RuntimeException,
com.sun.star.lang.IllegalArgumentException
{
try {
String sURL = null;
String sName = null;
XOutputStream xos = null;
-
- // get interesting values from sourceData
- for (int i = 0 ; i < aSourceData.length; i++)
+
+ // get interesting values from sourceData
+ for (int i = 0 ; i < aSourceData.length; i++)
{
- sName = aSourceData[i].Name;
+ sName = aSourceData[i].Name;
if (sName.equals("OutputStream"))
xos =
(XOutputStream)AnyConverter.toObject(XOutputStream.class, aSourceData[i].Value);
if (sName.equals("URL"))
sURL=(String)AnyConverter.toObject(String.class, aSourceData[i].Value);
}
-
+
// prepare the XML writer
Object tmpObj = null;
- if (m_xHandler == null)
+ if (m_xHandler == null)
{
tmpObj =
m_xServiceFactory.createInstance("com.sun.star.xml.sax.Writer");
if (tmpObj != null)
@@ -170,10 +170,10 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
if (m_xHandler == null)
return false;
- // Connect the provided output stream to the writer
+ // Connect the provided output stream to the writer
XActiveDataSource xADSource =
(XActiveDataSource)UnoRuntime.queryInterface(
XActiveDataSource.class, m_xHandler);
-
+
if (xADSource != null && xos != null)
xADSource.setOutputStream(xos);
else
@@ -181,23 +181,23 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
} catch (com.sun.star.uno.Exception e){
return false;
}
-
+
// done ...
return true;
}
-
- public void startDocument ()
+
+ public void startDocument ()
throws com.sun.star.xml.sax.SAXException
{
m_xHandler.startDocument();
}
-
+
public void endDocument()
throws com.sun.star.xml.sax.SAXException
{
m_xHandler.endDocument();
}
-
+
public void startElement (String str, com.sun.star.xml.sax.XAttributeList
xattribs)
throws com.sun.star.xml.sax.SAXException
{
@@ -215,12 +215,12 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
{
m_xHandler.characters(str);
}
-
+
public void ignorableWhitespace(String str)
throws com.sun.star.xml.sax.SAXException
{
if (!m_bPrettyPrint) return;
- else m_xHandler.ignorableWhitespace(str);
+ else m_xHandler.ignorableWhitespace(str);
}
public void processingInstruction(String aTarget, String aData)
@@ -234,12 +234,12 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
{
m_xHandler.setDocumentLocator(xLocator);
}
-
- // ------------------------------------------------------------
+
+ // ------------------------------------------------------------
// component management
-
+
public static XSingleServiceFactory __getServiceFactory(String implName,
- XMultiServiceFactory multiFactory, XRegistryKey regKey)
+ XMultiServiceFactory multiFactory, XRegistryKey regKey)
{
XSingleServiceFactory xSingleServiceFactory = null;
if (implName.equals(__implName) ) {
@@ -249,18 +249,19 @@ public class FlatXml implements XImportFilter,
XExportFilter, XServiceName,
} catch (java.lang.ClassNotFoundException e) {
return null;
}
- }
+ }
return xSingleServiceFactory;
}
-
+
// This method not longer necessary since OOo 3.4 where the component
registration
// was changed to passive component registration. For more details see
- // http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
+ // https://wiki.openoffice.org/wiki/Passive_Component_Registration
-// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
+// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
// {
// return FactoryHelper.writeRegistryServiceInfo(__implName,
// __serviceName, regKey);
// }
-
+
}
+
diff --git a/main/offapi/com/sun/star/report/XReportControlModel.idl
b/main/offapi/com/sun/star/report/XReportControlModel.idl
index 2e7f654..6efcd91 100644
--- a/main/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/main/offapi/com/sun/star/report/XReportControlModel.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,19 +7,20 @@
* 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_report_XReportControlModel_idl__
#define __com_sun_star_report_XReportControlModel_idl__
@@ -38,66 +39,67 @@
#ifndef __com_sun_star_report_XFormatCondition_idl__
#include <com/sun/star/report/XFormatCondition.idl>
#endif
+
//=============================================================================
- module com { module sun { module star { module report {
+ module com { module sun { module star { module report {
//=============================================================================
published interface XReportControlModel
{
- /** allows the creation of sub reports.
- */
- interface XReportComponent;
-
- interface XReportControlFormat;
-
- /** allows to register listeners to be notified of changes in the
container.
- */
- interface com::sun::star::container::XContainer;
-
- /** gives access to the <type
scope="com::sun::star::report">XFormatCondition</type> elements by index.
- */
- interface com::sun::star::container::XIndexContainer;
-
- /** Creates a format condition.
- @return
- report component
- */
- XFormatCondition createFormatCondition() raises(
com::sun::star::uno::Exception );
-
-
- /** Specifies which content should be shown.
- The value can be <br/>
- <li>the name of a database column. The format to use is field:[name]
</li>
- <li>the name of a function defined in the report or a group. The
format to use is rpt:[functionName]</li>
- <li>an expression like rpt:24+24-47</li>
- @see http://wiki.services.openoffice.org/wiki/SUN_Report_Builder
- @see http://wiki.services.openoffice.org/wiki/SUN_Report_Builder#Syntax
- @see http://wiki.services.openoffice.org/wiki/Base/Reports/Functions
- */
- [attribute,bound] string DataField
- {
- set raises (
com::sun::star::lang::IllegalArgumentException,com::sun::star::beans::UnknownPropertyException
);
- get raises ( com::sun::star::beans::UnknownPropertyException );
- };
-
- /** Specifies that the element gets printed when the group changes.
- The default value is <FALSE/>.
- */
- [attribute,bound] boolean PrintWhenGroupChange
- {
- set raises ( com::sun::star::beans::UnknownPropertyException );
- get raises ( com::sun::star::beans::UnknownPropertyException );
- };
-
- /** Describes the print expression of the report control model.
- If the expression evaluates to true than the report control model will
be printed otherwise not.
- */
- [attribute,bound] string ConditionalPrintExpression
- {
- set raises ( com::sun::star::beans::UnknownPropertyException );
- get raises ( com::sun::star::beans::UnknownPropertyException );
- };
+ /** allows the creation of sub reports.
+ */
+ interface XReportComponent;
+
+ interface XReportControlFormat;
+
+ /** allows to register listeners to be notified of changes in the
container.
+ */
+ interface com::sun::star::container::XContainer;
+
+ /** gives access to the <type
scope="com::sun::star::report">XFormatCondition</type> elements by index.
+ */
+ interface com::sun::star::container::XIndexContainer;
+
+ /** Creates a format condition.
+ @return
+ report component
+ */
+ XFormatCondition createFormatCondition() raises(
com::sun::star::uno::Exception );
+
+
+ /** Specifies which content should be shown.
+ The value can be <br/>
+ <li>the name of a database column. The format to use is
field:[name] </li>
+ <li>the name of a function defined in the report or a group.
The format to use is rpt:[functionName]</li>
+ <li>an expression like rpt:24+24-47</li>
+ @see https://wiki.openoffice.org/wiki/SUN_Report_Builder
+ @see https://wiki.openoffice.org/wiki/SUN_Report_Builder#Syntax
+ @see https://wiki.openoffice.org/wiki/Base/Reports/Functions
+ */
+ [attribute,bound] string DataField
+ {
+ set raises (
com::sun::star::lang::IllegalArgumentException,com::sun::star::beans::UnknownPropertyException
);
+ get raises ( com::sun::star::beans::UnknownPropertyException );
+ };
+
+ /** Specifies that the element gets printed when the group changes.
+ The default value is <FALSE/>.
+ */
+ [attribute,bound] boolean PrintWhenGroupChange
+ {
+ set raises ( com::sun::star::beans::UnknownPropertyException );
+ get raises ( com::sun::star::beans::UnknownPropertyException );
+ };
+
+ /** Describes the print expression of the report control model.
+ If the expression evaluates to true than the report control
model will be printed otherwise not.
+ */
+ [attribute,bound] string ConditionalPrintExpression
+ {
+ set raises ( com::sun::star::beans::UnknownPropertyException );
+ get raises ( com::sun::star::beans::UnknownPropertyException );
+ };
};
//=============================================================================
@@ -108,3 +110,4 @@ published interface XReportControlModel
=============================================================================*/
#endif
+
diff --git
a/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
b/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
index f88340c..684ca88 100644
---
a/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++
b/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,16 +8,16 @@
* 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.
- *
+ *
***********************************************************-->
<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="Settings"
oor:package="org.openoffice.Office.OOoImprovement" xml:lang="en-US">
<info>
@@ -60,7 +60,7 @@
<info>
<desc>the url where additional information can be found.</desc>
</info>
-
<value>http://wiki.services.openoffice.org/wiki/User_Experience/OpenOffice.org_User_Feedback_Program</value>
+
<value>https://wiki.openoffice.org/wiki/User_Experience/OpenOffice.org_User_Feedback_Program</value>
</prop>
</group>
<group oor:name="Counters">
@@ -108,7 +108,7 @@
<info>
<desc>The Emailaddress to fill out in the reportmail.xml file.
DO NOT SET THIS VALUE UNLESS YOU KNOW WHAT YOU ARE DOING!
- Its only purpose is testing and quality assureance.
+ Its only purpose is testing and quality assurance.
</desc>
</info>
<value></value>
