/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * This file incorporates work covered by the following license notice: * * 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 regarding copyright * ownership. The ASF licenses this file 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 . */ #ifndef INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H #define INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H #include #define REG_ENSURE(c, m) _REG_ENSURE(c, __FILE__, __LINE__, m) #define _REG_ENSURE(c, f, l, m) \ do \ { \ if (!(c) && ::osl_assertFailedLine(f, l, m)) \ ::osl_breakDebug(); \ } while (0) #endif // INCLUDED_REGISTRY_TEST_REGDIAGNOSE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ libreoffice-5-1'>distro/cib/libreoffice-5-1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/wizards/com
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-03-28 09:39:31 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-03-28 10:10:32 +0100
commit147063f58c6b7898e659321f581ea9551305a574 (patch)
tree17ff87f7b79442179a7b2453dc5e76e7ccb0ee34 /wizards/com
parent64a5509d9aef88c04dbaad7f553c2b83b23c045a (diff)
Revert "tdf#158803 remove some unused imports, unnecessary semicolons and related styling"
This reverts commit 9d4844374395ecce6b2ff4f9a71b3c8dae23050a. Reason for revert: fails in unit tests Change-Id: Icfaf6ab331ecce691b9a9462432e07c68d0fb40c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165417 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'wizards/com')
-rw-r--r--wizards/com/sun/star/wizards/agenda/TopicsControl.py2
-rw-r--r--wizards/com/sun/star/wizards/common/ConfigGroup.py2
-rw-r--r--wizards/com/sun/star/wizards/common/Configuration.py2
-rw-r--r--wizards/com/sun/star/wizards/common/SystemDialog.py2
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialog.py2
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py2
-rw-r--r--wizards/com/sun/star/wizards/text/TextDocument.py6
7 files changed, 9 insertions, 9 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
index bb8d8b81ae01..6e269f6bf242 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
@@ -643,7 +643,7 @@ class TopicsControl(ControlScroller):
elif tmp_switch_var1 == 3:
return cr.timebox
else:
- raise Exception("No such column")
+ raise Exception("No such column");
'''getControl
returns a control out of the given row, which is
diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py b/wizards/com/sun/star/wizards/common/ConfigGroup.py
index 4155e87f63cc..200d4ef9d1ad 100644
--- a/wizards/com/sun/star/wizards/common/ConfigGroup.py
+++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py
@@ -47,7 +47,7 @@ class ConfigGroup(object):
propertyName = field[len(prefix):]
child = getattr(self, field)
if isinstance(child, ConfigGroup):
- child.setRoot(self.root)
+ child.setRoot(self.root);
child.readConfiguration(configView.getByName(propertyName),
prefix)
else:
diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py
index 7a469a11bba5..91274e0b288c 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.py
+++ b/wizards/com/sun/star/wizards/common/Configuration.py
@@ -44,7 +44,7 @@ class Configuration(object):
@classmethod
def getProductName(self, xMSF):
try:
- oProdNameAccess = self.getConfigurationRoot(xMSF, "org.openoffice.Setup/Product", False)
+ oProdNameAccess = self.getConfigurationRoot(xMSF, "org.openoffice.Setup/Product", False);
return oProdNameAccess.getByName("ooName")
except Exception:
traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py
index f9c3776b40c1..35bcdadfac3b 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -114,7 +114,7 @@ class SystemDialog(object):
return str(i.Value).replace("%productname%", "LibreOffice")
raise Exception(
- "UIName property not found for Filter " + filterName)
+ "UIName property not found for Filter " + filterName);
except Exception:
traceback.print_exc()
return None
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 58d50463c5ab..0153eb639d30 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -16,7 +16,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
from .FaxWizardDialogResources import FaxWizardDialogResources
-from .FaxWizardDialogConst import FaxWizardDialogConst, HIDMAIN
+from .FaxWizardDialogConst import FaxWizardDialogConst, HIDMAIN, HID
from ..ui.WizardDialog import WizardDialog, uno, UIConsts, PropertyNames
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index de85eb50c049..66c0e33457b5 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -234,7 +234,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
self.xUnoDialog.endExecute()
self.running = False
- return True
+ return True;
def closeDocument(self):
try:
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py