This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 97581ef Fixed links to Wiki
97581ef is described below
commit 97581ef47cb9ffaae6b8757544c8939c93b1f0cc
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Apr 6 23:13:01 2021 +0200
Fixed links to Wiki
(cherry picked from commit aa01715fee31b673717d064c9bd5fb3872e6dbd3)
---
.../Database/DriverSkeleton/SServices.cxx | 43 +++++++++++-----------
main/swext/mediawiki/help/wikiaccount.xhp | 16 ++++----
2 files changed, 29 insertions(+), 30 deletions(-)
diff --git
a/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
b/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index ecc9cef..24a2844 100644
--- a/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.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.
- *
+ *
*************************************************************/
@@ -37,7 +37,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
(
const Reference< XMultiServiceFactory > &
rServiceManager,
- const OUString & rComponentName,
+ const OUString & rComponentName,
::cppu::ComponentInstantiation pCreateFunction,
const Sequence< OUString > & rServiceNames,
rtl_ModuleCount* _pTemp
@@ -51,8 +51,8 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL
*createFactoryFunc)
//---------------------------------------------------------------------------------------
void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
+ const OUString& aServiceImplName,
+ const Sequence< OUString>& Services,
const Reference< ::com::sun::star::registry::XRegistryKey > &
xKey)
{
OUString aMainKeyName;
@@ -60,7 +60,7 @@ void REGISTER_PROVIDER(
aMainKeyName += aServiceImplName;
aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey(
xKey->createKey(aMainKeyName) );
+ Reference< ::com::sun::star::registry::XRegistryKey > xNewKey(
xKey->createKey(aMainKeyName) );
OSL_ENSURE(xNewKey.is(), "SKELETON::component_writeInfo : could not
create a registry key !");
for (sal_uInt32 i=0; i<Services.getLength(); ++i)
@@ -86,23 +86,23 @@ struct ProviderRequest
inline
sal_Bool CREATE_PROVIDER(
- const OUString& Implname,
- const Sequence< OUString > & Services,
+ const OUString& Implname,
+ const Sequence< OUString > & Services,
::cppu::ComponentInstantiation Factory,
createFactoryFunc creator
)
{
if (!xRet.is() && (Implname == sImplementationName))
- try
- {
- xRet = creator( xServiceManager,
sImplementationName,Factory, Services,0);
+ try
+ {
+ xRet = creator( xServiceManager,
sImplementationName,Factory, Services,0);
}
catch(...)
{
}
return xRet.is();
}
-
+
void* getProvider() const { return xRet.get(); }
};
@@ -118,21 +118,21 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnviron
// This method not longer necessary since OOo 3.4 where the component
registration was
// 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
//---------------------------------------------------------------------------------------
// extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
// void* pServiceManager,
// void* pRegistryKey
// )
// {
-// if (pRegistryKey)
-// try
+// if (pRegistryKey)
+// try
// {
// Reference< ::com::sun::star::registry::XRegistryKey >
xKey(reinterpret_cast<
::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
// REGISTER_PROVIDER(
-// SkeletonDriver::getImplementationName_Static(),
-// SkeletonDriver::getSupportedServiceNames_Static(),
xKey);
+// SkeletonDriver::getImplementationName_Static(),
+// SkeletonDriver::getSupportedServiceNames_Static(),
xKey);
// return sal_True;
// }
@@ -156,9 +156,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
component_getFactory(
ProviderRequest aReq(pServiceManager,pImplementationName);
aReq.CREATE_PROVIDER(
- SkeletonDriver::getImplementationName_Static(),
+ SkeletonDriver::getImplementationName_Static(),
SkeletonDriver::getSupportedServiceNames_Static(),
- SkeletonDriver_CreateInstance,
::cppu::createSingleFactory)
+ SkeletonDriver_CreateInstance,
::cppu::createSingleFactory)
;
if(aReq.xRet.is())
@@ -170,4 +170,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
component_getFactory(
return pRet;
};
-
diff --git a/main/swext/mediawiki/help/wikiaccount.xhp
b/main/swext/mediawiki/help/wikiaccount.xhp
index ab6a198..2869e56 100644
--- a/main/swext/mediawiki/help/wikiaccount.xhp
+++ b/main/swext/mediawiki/help/wikiaccount.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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,20 +8,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.
- *
+ *
***********************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="comsunstarwikiMediaWikiwikiaccountxml" indexer="include"
status="PUBLISH">
@@ -34,18 +34,18 @@
</history>
</meta>
<body>
-<bookmark branch="hid/vnd.com.sun.star.wiki:account" id="bm_id7021088"
localize="false"/>
+<bookmark branch="hid/vnd.com.sun.star.wiki:account" id="bm_id7021088"
localize="false"/>
<paragraph role="heading" id="hd_id960722" xml-lang="en-US" level="1"
l10n="NEW">MediaWiki</paragraph>
<paragraph role="paragraph" id="par_id4571672" xml-lang="en-US" l10n="NEW">Use
the MediaWiki dialog to add or edit your MediaWiki account
settings.</paragraph><comment>URL</comment>
<bookmark xml-lang="en-US"
branch="hid/com.sun.star.wiki.MediaWiki.EditSetting.UrlField" id="bm_id4558244"
localize="false"/>
-<paragraph role="paragraph" id="par_id7631458" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Enter the URL of a MediaWiki
server, starting with http://</ahelp></paragraph><comment>Username</comment>
+<paragraph role="paragraph" id="par_id7631458" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Enter the URL of a MediaWiki
server, starting with https://</ahelp></paragraph><comment>Username</comment>
<bookmark xml-lang="en-US"
branch="hid/com.sun.star.wiki.MediaWiki.EditSetting.UsernameField"
id="bm_id4558245" localize="false"/>
<paragraph role="paragraph" id="par_id7862483" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Enter your user name on the
MediaWiki server. Leave empty for anonymous
access.</ahelp></paragraph><comment>Password</comment>
<bookmark xml-lang="en-US"
branch="hid/com.sun.star.wiki.MediaWiki.EditSetting.PasswordField"
id="bm_id4558246" localize="false"/>
<paragraph role="paragraph" id="par_id1113010" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Enter your password on the
MediaWiki server. Leave empty for anonymous
access.</ahelp></paragraph><comment>Save password</comment>
<bookmark xml-lang="en-US"
branch="hid/com.sun.star.wiki.MediaWiki.EditSetting.SaveBox" id="bm_id4558247"
localize="false"/>
<paragraph role="paragraph" id="par_id656758" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Enable to store your password
between sessions. The master password must be enabled, see <item
type="menuitem">Tools - Options - %PRODUCTNAME -
Security</item>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3112582" xml-lang="en-US"
l10n="NEW">Enter the Internet address of a Wiki server in a format like
http://wiki.services.openoffice.org/wiki or copy the URL from a web
browser.</paragraph>
+<paragraph role="paragraph" id="par_id3112582" xml-lang="en-US"
l10n="NEW">Enter the Internet address of a Wiki server in a format like
https://wiki.openoffice.org/wiki or copy the URL from a web browser.</paragraph>
<paragraph role="paragraph" id="par_id628070" xml-lang="en-US" l10n="NEW">If
the Wiki allows anonymous access, you can leave the account text boxes empty.
Else enter your user name and password.</paragraph>
<paragraph role="paragraph" id="par_id9046601" xml-lang="en-US" l10n="NEW">If
you have enabled the master password feature on the Security tab page of the
Tools - Options - %PRODUCTNAME dialog, then the software can store your
password and automatically insert the data where necessary. Enable the "Save
password" checkbox to store your password.</paragraph>
</body>
