Skip to content

Commit e302942

Browse files
prrvchrprrvchr
committed
git subrepo pull (merge) uno
subrepo: subdir: "uno" merged: "5408ab1" upstream: origin: "https://github.com/prrvchr/uno.git" branch: "main" commit: "2325c14" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596"
1 parent 2df6489 commit e302942

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1033
-558
lines changed

‎uno/.gitrepo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/prrvchr/uno.git
88
branch = main
9-
commit = a2fa9f5975a35e8447907e51b0f78ac1b1b76e17
9+
commit = 2325c1473ec0ed12742f659c442ae04c55494706
1010
parent = f954323c2464513bbce1f2f9fb8f700e2ea0da87
1111
method = merge
1212
cmdver = 0.4.3

‎uno/dialog/ucb/OptionsDialog.xdl‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,44 @@
66
</dlg:styles>
77
<dlg:bulletinboard>
88
<dlg:fixedline dlg:style-id="0" dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="63" dlg:width="244" dlg:height="14" dlg:help-text="&amp;OptionsDialog.FixedLine1.HelpText" dlg:value="&amp;OptionsDialog.FixedLine1.Label"/>
9-
<dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
9+
<dlg:checkbox dlg:id="CheckBox1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="150" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CheckBox1.HelpText" dlg:value="&amp;OptionsDialog.CheckBox1.Label" dlg:valign="center" dlg:checked="false">
10+
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EnableShare" script:language="UNO"/>
11+
</dlg:checkbox>
12+
<dlg:textfield dlg:id="TextField1" dlg:tab-index="2" dlg:left="170" dlg:top="80" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.TextField1.HelpText" dlg:valign="center" dlg:value="&amp;OptionsDialog.TextField1.Text"/>
13+
<dlg:text dlg:id="Label1" dlg:tab-index="3" dlg:left="10" dlg:top="100" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
1014
<dlg:radiogroup>
11-
<dlg:radio dlg:id="OptionButton1" dlg:tab-index="2" dlg:left="65" dlg:top="80" dlg:width="75" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton1.HelpText" dlg:value="&amp;OptionsDialog.OptionButton1.Label" dlg:valign="center">
15+
<dlg:radio dlg:id="OptionButton1" dlg:tab-index="4" dlg:left="65" dlg:top="100" dlg:width="70" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton1.HelpText" dlg:value="&amp;OptionsDialog.OptionButton1.Label" dlg:valign="center">
1216
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EnabledSync" script:language="UNO"/>
1317
</dlg:radio>
14-
<dlg:radio dlg:id="OptionButton2" dlg:tab-index="3" dlg:left="145" dlg:top="80" dlg:width="75" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton2.HelpText" dlg:value="&amp;OptionsDialog.OptionButton2.Label" dlg:valign="center">
15-
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EnabledSync" script:language="UNO"/>
18+
<dlg:radio dlg:id="OptionButton2" dlg:tab-index="5" dlg:left="140" dlg:top="100" dlg:width="70" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton2.HelpText" dlg:value="&amp;OptionsDialog.OptionButton2.Label" dlg:valign="center">
19+
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EnableSync" script:language="UNO"/>
1620
</dlg:radio>
17-
<dlg:radio dlg:id="OptionButton3" dlg:tab-index="4" dlg:left="225" dlg:top="80" dlg:width="25" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton3.HelpText" dlg:value="&amp;OptionsDialog.OptionButton3.Label" dlg:valign="center">
21+
<dlg:radio dlg:id="OptionButton3" dlg:tab-index="6" dlg:left="215" dlg:top="100" dlg:width="35" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton3.HelpText" dlg:value="&amp;OptionsDialog.OptionButton3.Label" dlg:valign="center">
1822
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:DisableSync" script:language="UNO"/>
1923
</dlg:radio>
2024
</dlg:radiogroup>
21-
<dlg:text dlg:id="Label2" dlg:tab-index="5" dlg:left="10" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:valign="center"/>
22-
<dlg:numericfield dlg:id="NumericField1" dlg:tab-index="6" dlg:left="100" dlg:top="100" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField1.HelpText" dlg:decimal-accuracy="0" dlg:value-min="5" dlg:value-max="1440"/>
23-
<dlg:text dlg:id="Label3" dlg:tab-index="7" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label3.HelpText" dlg:value="&amp;OptionsDialog.Label3.Label" dlg:valign="center"/>
25+
<dlg:text dlg:id="Label2" dlg:tab-index="7" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:valign="center"/>
26+
<dlg:numericfield dlg:id="NumericField1" dlg:tab-index="8" dlg:left="100" dlg:top="120" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField1.HelpText" dlg:decimal-accuracy="0" dlg:value-min="5" dlg:value-max="1440"/>
27+
<dlg:text dlg:id="Label3" dlg:tab-index="9" dlg:left="10" dlg:top="140" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label3.HelpText" dlg:value="&amp;OptionsDialog.Label3.Label" dlg:valign="center"/>
2428
<dlg:radiogroup>
25-
<dlg:radio dlg:id="OptionButton4" dlg:tab-index="8" dlg:left="100" dlg:top="120" dlg:width="75" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton4.HelpText" dlg:value="&amp;OptionsDialog.OptionButton4.Label" dlg:valign="center" dlg:checked="true">
29+
<dlg:radio dlg:id="OptionButton4" dlg:tab-index="10" dlg:left="100" dlg:top="140" dlg:width="75" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton4.HelpText" dlg:value="&amp;OptionsDialog.OptionButton4.Label" dlg:valign="center" dlg:checked="true">
2630
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Download" script:language="UNO"/>
2731
</dlg:radio>
28-
<dlg:radio dlg:id="OptionButton5" dlg:tab-index="9" dlg:left="200" dlg:top="120" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton5.HelpText" dlg:value="&amp;OptionsDialog.OptionButton5.Label" dlg:valign="center">
32+
<dlg:radio dlg:id="OptionButton5" dlg:tab-index="11" dlg:left="200" dlg:top="140" dlg:width="50" dlg:height="15" dlg:help-text="&amp;OptionsDialog.OptionButton5.HelpText" dlg:value="&amp;OptionsDialog.OptionButton5.Label" dlg:valign="center">
2933
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:Upload" script:language="UNO"/>
3034
</dlg:radio>
3135
</dlg:radiogroup>
32-
<dlg:text dlg:id="Label4" dlg:tab-index="10" dlg:left="10" dlg:top="140" dlg:width="40" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label4.HelpText" dlg:value="&amp;OptionsDialog.Label4.Label" dlg:align="right" dlg:valign="center"/>
33-
<dlg:numericfield dlg:id="NumericField2" dlg:tab-index="11" dlg:page="1" dlg:left="55" dlg:top="140" dlg:width="25" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField2.HelpText" dlg:decimal-accuracy="0" dlg:value-min="256" dlg:value-max="4096"/>
34-
<dlg:numericfield dlg:id="NumericField3" dlg:tab-index="12" dlg:page="2" dlg:left="55" dlg:top="140" dlg:width="25" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField3.HelpText" dlg:decimal-accuracy="0" dlg:value-min="256" dlg:value-max="4096"/>
35-
<dlg:text dlg:id="Label5" dlg:tab-index="13" dlg:left="95" dlg:top="140" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label5.HelpText" dlg:value="&amp;OptionsDialog.Label5.Label" dlg:align="right" dlg:valign="center"/>
36-
<dlg:numericfield dlg:id="NumericField4" dlg:tab-index="14" dlg:page="1" dlg:left="145" dlg:top="140" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField4.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="900"/>
37-
<dlg:numericfield dlg:id="NumericField5" dlg:tab-index="15" dlg:page="2" dlg:left="145" dlg:top="140" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField5.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="900"/>
38-
<dlg:text dlg:id="Label6" dlg:tab-index="16" dlg:left="180" dlg:top="140" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label6.HelpText" dlg:value="&amp;OptionsDialog.Label6.Label" dlg:align="right" dlg:valign="center"/>
39-
<dlg:numericfield dlg:id="NumericField6" dlg:tab-index="17" dlg:page="1" dlg:left="230" dlg:top="140" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField6.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="10"/>
40-
<dlg:numericfield dlg:id="NumericField7" dlg:tab-index="18" dlg:page="2" dlg:left="230" dlg:top="140" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField7.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="10"/>
41-
<dlg:text dlg:id="Label7" dlg:tab-index="19" dlg:left="10" dlg:top="160" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label7.HelpText" dlg:value="&amp;OptionsDialog.Label7.Label" dlg:valign="center"/>
42-
<dlg:button dlg:id="CommandButton1" dlg:tab-index="20" dlg:disabled="true" dlg:left="100" dlg:top="160" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CommandButton1.HelpText" dlg:value="&amp;OptionsDialog.CommandButton1.Label">
36+
<dlg:text dlg:id="Label4" dlg:tab-index="12" dlg:left="10" dlg:top="160" dlg:width="40" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label4.HelpText" dlg:value="&amp;OptionsDialog.Label4.Label" dlg:align="right" dlg:valign="center"/>
37+
<dlg:numericfield dlg:id="NumericField2" dlg:tab-index="13" dlg:page="1" dlg:left="55" dlg:top="160" dlg:width="25" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField2.HelpText" dlg:decimal-accuracy="0" dlg:value-min="256" dlg:value-max="4096"/>
38+
<dlg:numericfield dlg:id="NumericField3" dlg:tab-index="14" dlg:page="2" dlg:left="55" dlg:top="160" dlg:width="25" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField3.HelpText" dlg:decimal-accuracy="0" dlg:value-min="256" dlg:value-max="4096"/>
39+
<dlg:text dlg:id="Label5" dlg:tab-index="15" dlg:left="95" dlg:top="160" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label5.HelpText" dlg:value="&amp;OptionsDialog.Label5.Label" dlg:align="right" dlg:valign="center"/>
40+
<dlg:numericfield dlg:id="NumericField4" dlg:tab-index="16" dlg:page="1" dlg:left="145" dlg:top="160" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField4.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="900"/>
41+
<dlg:numericfield dlg:id="NumericField5" dlg:tab-index="17" dlg:page="2" dlg:left="145" dlg:top="160" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField5.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="900"/>
42+
<dlg:text dlg:id="Label6" dlg:tab-index="18" dlg:left="180" dlg:top="160" dlg:width="45" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label6.HelpText" dlg:value="&amp;OptionsDialog.Label6.Label" dlg:align="right" dlg:valign="center"/>
43+
<dlg:numericfield dlg:id="NumericField6" dlg:tab-index="19" dlg:page="1" dlg:left="230" dlg:top="160" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField6.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="10"/>
44+
<dlg:numericfield dlg:id="NumericField7" dlg:tab-index="20" dlg:page="2" dlg:left="230" dlg:top="160" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField7.HelpText" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:value-max="10"/>
45+
<dlg:text dlg:id="Label7" dlg:tab-index="21" dlg:left="10" dlg:top="180" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label7.HelpText" dlg:value="&amp;OptionsDialog.Label7.Label" dlg:valign="center"/>
46+
<dlg:button dlg:id="CommandButton1" dlg:tab-index="22" dlg:disabled="true" dlg:left="100" dlg:top="180" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CommandButton1.HelpText" dlg:value="&amp;OptionsDialog.CommandButton1.Label">
4347
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:ViewData" script:language="UNO"/>
4448
</dlg:button>
4549
</dlg:bulletinboard>

‎uno/lib/java/helper/EventLogger.java‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,22 @@
5353
import com.sun.star.logging.XLogger;
5454
import com.sun.star.logging.XLoggerPool;
5555
import com.sun.star.uno.DeploymentException;
56+
import com.sun.star.uno.Exception;
5657
import com.sun.star.uno.UnoRuntime;
5758
import com.sun.star.uno.XComponentContext;
5859

5960

6061
public class EventLogger
6162
{
6263
protected XComponentContext m_xContext;
64+
private static XLoggerPool m_xPool;
6365
private static String m_service = "io.github.prrvchr.jdbcDriverOOo.LoggerPool";
6466
private String m_name;
6567
private XLogger m_xLogger;
6668

6769
// The constructor method:
6870
public EventLogger(XComponentContext context)
71+
throws com.sun.star.uno.Exception
6972
{
7073
this(context, "");
7174
}
@@ -77,34 +80,23 @@ public EventLogger(XComponentContext context)
7780
* the component context to create services.
7881
* @param name
7982
* the name of the logger to create. If empty, the office-wide default logger will be used.
83+
* @throws com.sun.star.uno.Exception
84+
* @throws com.sun.star.uno.Exception
8085
*/
8186
public EventLogger(XComponentContext context,
8287
String name)
8388
{
84-
this.m_xContext = context;
85-
this.m_name = name;
86-
try {
87-
XLoggerPool loggerPool = getLoggerPool(context);
88-
if (!name.isEmpty()) {
89-
m_xLogger = loggerPool.getNamedLogger(name);
90-
}
91-
else {
92-
m_xLogger = loggerPool.getDefaultLogger();
93-
}
89+
m_xContext = context;
90+
m_name = name;
91+
if (m_xPool == null) {
92+
m_xPool = _getLoggerPool();
9493
}
95-
catch (com.sun.star.uno.RuntimeException e) {
94+
if (!name.isEmpty()) {
95+
m_xLogger = m_xPool.getNamedLogger(name);
9696
}
97-
}
98-
99-
public static XLoggerPool getLoggerPool(XComponentContext context)
100-
{
101-
Object object = UnoHelper.createService(context, m_service);
102-
XLoggerPool pool = UnoRuntime.queryInterface(XLoggerPool.class, object);
103-
if (pool == null) {
104-
throw new DeploymentException("component context fails to supply singleton com.sun.star.logging.LoggerPool of type com.sun.star.logging.XLoggerPool",
105-
context);
97+
else {
98+
m_xLogger = m_xPool.getDefaultLogger();
10699
}
107-
return pool;
108100
}
109101

110102
/**
@@ -208,8 +200,9 @@ public boolean log(int level,
208200
String message,
209201
Object... arguments)
210202
{
211-
if (isLoggable(level))
203+
if (isLoggable(level)) {
212204
return _log(level, null, null, message, arguments);
205+
}
213206
return false;
214207
}
215208

@@ -243,7 +236,7 @@ public boolean log(int level,
243236
message += "\n" + stringWriter.getBuffer().toString();
244237
return _log(level, null, null, message);
245238
}
246-
return true;
239+
return false;
247240
}
248241

249242
/**
@@ -259,9 +252,7 @@ public boolean logp(int level,
259252
Object...arguments)
260253
{
261254
if (isLoggable(level)) {
262-
System.out.println("EventLogger.logp() 1");
263255
StackTraceElement caller = Thread.currentThread().getStackTrace()[2];
264-
System.out.println("EventLogger.logp() 2 Class: " + caller.getClassName() + " - Method: " + caller.getMethodName());
265256
return _log(level, caller.getClassName(), caller.getMethodName(), message, arguments);
266257
}
267258
return false;
@@ -298,7 +289,7 @@ public boolean logp(int level,
298289
StackTraceElement caller = Thread.currentThread().getStackTrace()[2];
299290
return _log(level, caller.getClassName(), caller.getMethodName(), message);
300291
}
301-
return true;
292+
return false;
302293
}
303294

304295
protected boolean _log(int level,
@@ -310,10 +301,9 @@ protected boolean _log(int level,
310301
if (m_xLogger == null) {
311302
return false;
312303
}
313-
try {
304+
if (arguments.length > 0) {
314305
message = String.format(message, arguments);
315306
}
316-
catch (Exception e) { }
317307
if (clazz != null && method != null) {
318308
m_xLogger.logp(level, clazz, method, message);
319309
}
@@ -323,4 +313,19 @@ protected boolean _log(int level,
323313
return true;
324314
}
325315

316+
private XLoggerPool _getLoggerPool()
317+
{
318+
XLoggerPool pool = null;
319+
try {
320+
Object object = m_xContext.getServiceManager().createInstanceWithContext(m_service, m_xContext);
321+
pool = UnoRuntime.queryInterface(XLoggerPool.class, object);
322+
}
323+
catch (Exception e) {}
324+
if (pool == null) {
325+
throw new DeploymentException("component context fails to supply singleton com.sun.star.logging.LoggerPool of type com.sun.star.logging.XLoggerPool",
326+
m_xContext);
327+
}
328+
return pool;
329+
}
330+
326331
}

‎uno/lib/java/helper/ResourceBasedEventLogger.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ public boolean log(int level,
9696
int id,
9797
Object... arguments)
9898
{
99-
if (isLoggable(level))
99+
if (isLoggable(level)) {
100100
return _log(level, null, null, loadStringMessage(id), arguments);
101+
}
101102
return false;
102103
}
103104

@@ -110,8 +111,9 @@ public boolean log(int level,
110111
public boolean log(int level,
111112
String message)
112113
{
113-
if (isLoggable(level))
114+
if (isLoggable(level)) {
114115
return _log(level, null, null, message);
116+
}
115117
return false;
116118
}
117119

‎uno/lib/java/helper/UnoHelper.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.sun.star.beans.NamedValue;
1515
import com.sun.star.beans.PropertyAttribute;
1616
import com.sun.star.beans.PropertyValue;
17+
import com.sun.star.beans.XIntrospection;
1718
import com.sun.star.beans.XPropertySet;
1819
import com.sun.star.beans.XPropertySetInfo;
1920
import com.sun.star.container.NoSuchElementException;
@@ -866,5 +867,12 @@ public static String getClassPath()
866867
return buffer.toString();
867868
}
868869

870+
public static void inspect(XComponentContext context, XInterface descriptor)
871+
{
872+
String service = "mytools.Mri";
873+
Object object = UnoHelper.createService(context, service);
874+
XIntrospection mri = (XIntrospection) UnoRuntime.queryInterface(XIntrospection.class, object);
875+
mri.inspect(descriptor);
876+
}
869877

870878
}

0 commit comments

Comments
 (0)