[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - NOTICE sfx2/source svx/Library_svx.mk
Oliver-Rainer Wittmann
orw at apache.org
Mon May 13 02:00:25 PDT 2013
NOTICE | 54 ++++++++++++-------------
sfx2/source/sidebar/AsynchronousCall.cxx | 2
sfx2/source/sidebar/IContextChangeReceiver.cxx | 34 +++++++++++++++
sfx2/source/sidebar/ILayoutableWindow.cxx | 34 +++++++++++++++
svx/Library_svx.mk | 1
5 files changed, 96 insertions(+), 29 deletions(-)
New commits:
commit 0e19eca42b149bc84f4aa3ead5c29bd64147bedc
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Mon May 13 08:18:22 2013 +0000
122047: adding missing pre-compiled header include
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx b/sfx2/source/sidebar/IContextChangeReceiver.cxx
index 99f4d8c..c6520c3 100644
--- a/sfx2/source/sidebar/IContextChangeReceiver.cxx
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -19,6 +19,8 @@
*
*************************************************************/
+#include "precompiled_sfx2.hxx"
+
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx b/sfx2/source/sidebar/ILayoutableWindow.cxx
index a81b066..8f89cf3 100644
--- a/sfx2/source/sidebar/ILayoutableWindow.cxx
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -19,6 +19,8 @@
*
*************************************************************/
+#include "precompiled_sfx2.hxx"
+
#include <sfx2/sidebar/ILayoutableWindow.hxx>
commit ba6704b01ebc30b06485ef7f914b873201a08e85
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 07:41:14 2013 +0000
122047: Remove last traces of unused toolbox controller.
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 9281d88..56fab42 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -213,7 +213,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/sidebar/tools/Popup \
svx/source/sidebar/tools/ValueSetWithTextControl \
svx/source/sidebar/insert/InsertPropertyPanel \
- svx/source/sidebar/insert/SimpleToolBoxController \
svx/source/stbctrls/pszctrl \
svx/source/stbctrls/insctrl \
svx/source/stbctrls/selctrl \
commit 107eb08386046f1e78dc32b21f569c6aa7352cd1
Author: Andre Fischer <af at apache.org>
Date: Mon May 13 07:40:20 2013 +0000
122047: Added missing implementation of virtual destructors.
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx
index 9704d98..ad3231a 100755
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -72,7 +72,7 @@ void AsynchronousCall::CancelRequest (void)
if (mnCallId != 0)
{
Application::RemoveUserEvent(mnCallId);
- mnCallId = -1;
+ mnCallId = 0;
}
}
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx b/sfx2/source/sidebar/IContextChangeReceiver.cxx
new file mode 100644
index 0000000..99f4d8c
--- /dev/null
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -0,0 +1,32 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * 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.
+ *
+ *************************************************************/
+
+#include <sfx2/sidebar/IContextChangeReceiver.hxx>
+
+
+namespace sfx2 { namespace sidebar {
+
+
+IContextChangeReceiver::~IContextChangeReceiver (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx b/sfx2/source/sidebar/ILayoutableWindow.cxx
new file mode 100644
index 0000000..a81b066
--- /dev/null
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -0,0 +1,32 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * 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.
+ *
+ *************************************************************/
+
+#include <sfx2/sidebar/ILayoutableWindow.hxx>
+
+
+namespace sfx2 { namespace sidebar {
+
+
+ILayoutableWindow::~ILayoutableWindow (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
commit f2e09c9f5100836b9b08c6423e4845c127310637
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Mon May 13 01:55:40 2013 +0000
Update year in NOTICE file, again
diff --git a/NOTICE b/NOTICE
index 4c830a8..6529a7b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache OpenOffice
-Copyright 2011, 201333 The Apache Software Foundation
+Copyright 2011, 2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
commit 7711bd5b33f87214ac6a0b0eac157b60e8bcd164
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Mon May 13 01:53:19 2013 +0000
Update year in NOTICE file
diff --git a/NOTICE b/NOTICE
index 16a22b4..4c830a8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache OpenOffice
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011, 201333 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
commit bc71ebf6311b64f281d9059f6b108ff1163c4678
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Mon May 13 01:53:11 2013 +0000
Replace CRLF line terminators
diff --git a/NOTICE b/NOTICE
index 2670fde..16a22b4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
____
-
+
Portions of this software copyright (c) 2000-2011, Oracle and/or its affiliates <http://www.oracle.com/>.
____
@@ -68,17 +68,17 @@ modifications by Spyglass Inc., Carnegie Mellon University, and
Bell Communications Research, Inc (Bellcore).
-Apache Commons Codec
-Copyright 2002-2012 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
-test data from http://aspell.sourceforge.net/test/batch0.tab.
-
-Copyright (C) 2002 Kevin Atkinson (kevina at gnu.org). Verbatim copying
-and distribution of this entire article is permitted in any medium,
+Apache Commons Codec
+Copyright 2002-2012 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
+test data from http://aspell.sourceforge.net/test/batch0.tab.
+
+Copyright (C) 2002 Kevin Atkinson (kevina at gnu.org). Verbatim copying
+and distribution of this entire article is permitted in any medium,
provided this notice is preserved.
Apache Jakarta HttpClient
@@ -87,20 +87,20 @@ Copyright 1999-2007 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-Apache Commons Lang
-Copyright 2001-2012 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software from the Spring Framework,
-under the Apache License 2.0 (see: StringUtils.containsWhitespace())
-
-
-Apache Commons Logging
-Copyright 2003-2007 The Apache Software Foundation
-
-This product includes software developed by
+Apache Commons Lang
+Copyright 2001-2012 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software from the Spring Framework,
+under the Apache License 2.0 (see: StringUtils.containsWhitespace())
+
+
+Apache Commons Logging
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
More information about the Libreoffice-commits
mailing list