Commit e1a2b71e authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Merged revision(s) r62977 from...

Merged revision(s) r62977 from AVS/Sources/TeamlabOffice/branches/TeamlabOffice_v3.0_Postgresql/OfficeWeb* delete Private

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63428 954022d7-b5bf-4e40-9824-e11837661b57
parent 57d94c00
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
"../../Excel/model/CellInfo.js", "../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js", "../../Excel/model/AdvancedOptions.js",
"../../Common/Private/Locks.js" "../../Common/Locks.js"
], ],
"dst": "../../PowerPoint/sdk-all.js", "dst": "../../PowerPoint/sdk-all.js",
"externs": [ "externs": [
......
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
"../../Excel/model/CellInfo.js", "../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js", "../../Excel/model/AdvancedOptions.js",
"../../Common/Private/Locks.js" "../../Common/Locks.js"
], ],
"dst": "../../Word/sdk-all.js", "dst": "../../Word/sdk-all.js",
"externs": [ "externs": [
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<script type="text/javascript" src="model/ConditionalFormatting.js"></script> <script type="text/javascript" src="model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="model/CellComment.js"></script> <script type="text/javascript" src="model/CellComment.js"></script>
<script type="text/javascript" src="model/Private/CellComment.js"></script>
<script type="text/javascript" src="../Common/NumFormat.js"></script> <script type="text/javascript" src="../Common/NumFormat.js"></script>
<script type="text/javascript" src="model/Serialize.js"></script> <script type="text/javascript" src="model/Serialize.js"></script>
<script type="text/javascript" src="model/WorkbookElems.js"></script> <script type="text/javascript" src="model/WorkbookElems.js"></script>
...@@ -107,7 +106,6 @@ ...@@ -107,7 +106,6 @@
<script type="text/javascript" src="view/CellTextRender.js"></script> <script type="text/javascript" src="view/CellTextRender.js"></script>
<script type="text/javascript" src="view/CellEditorView.js"></script> <script type="text/javascript" src="view/CellEditorView.js"></script>
<script type="text/javascript" src="view/WorksheetView.js"></script> <script type="text/javascript" src="view/WorksheetView.js"></script>
<script type="text/javascript" src="view/Private/WorksheetView.js"></script>
<script type="text/javascript" src="view/HandlerList.js"></script> <script type="text/javascript" src="view/HandlerList.js"></script>
<script type="text/javascript" src="view/EventsController.js"></script> <script type="text/javascript" src="view/EventsController.js"></script>
<script type="text/javascript" src="view/WorkbookView.js"></script> <script type="text/javascript" src="view/WorkbookView.js"></script>
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
<script type="text/javascript" src="model/FormulaObjects/informationFunctions.js"></script> <script type="text/javascript" src="model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="model/FormulaObjects/logicalFunctions.js"></script> <script type="text/javascript" src="model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="model/CellComment.js"></script> <script type="text/javascript" src="model/CellComment.js"></script>
<script type="text/javascript" src="model/Private/CellComment.js"></script>
<script type="text/javascript" src="../Common/NumFormat.js"></script> <script type="text/javascript" src="../Common/NumFormat.js"></script>
<script type="text/javascript" src="model/Serialize.js"></script> <script type="text/javascript" src="model/Serialize.js"></script>
<script type="text/javascript" src="model/WorkbookElems.js"></script> <script type="text/javascript" src="model/WorkbookElems.js"></script>
...@@ -96,7 +95,6 @@ ...@@ -96,7 +95,6 @@
<script type="text/javascript" src="view/CellTextRender.js"></script> <script type="text/javascript" src="view/CellTextRender.js"></script>
<script type="text/javascript" src="view/CellEditorView.js"></script> <script type="text/javascript" src="view/CellEditorView.js"></script>
<script type="text/javascript" src="view/WorksheetView.js"></script> <script type="text/javascript" src="view/WorksheetView.js"></script>
<script type="text/javascript" src="view/Private/WorksheetView.js"></script>
<script type="text/javascript" src="view/HandlerList.js"></script> <script type="text/javascript" src="view/HandlerList.js"></script>
<script type="text/javascript" src="view/EventsController.js"></script> <script type="text/javascript" src="view/EventsController.js"></script>
<script type="text/javascript" src="view/WorkbookView.js"></script> <script type="text/javascript" src="view/WorkbookView.js"></script>
......
...@@ -296,7 +296,6 @@ ...@@ -296,7 +296,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/informationFunctions.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/logicalFunctions.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellComment.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Private/CellComment.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Serialize.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/WorkbookElems.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Workbook.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Workbook.js"></script>
...@@ -310,7 +309,6 @@ ...@@ -310,7 +309,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellTextRender.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellTextRender.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellEditorView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellEditorView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorksheetView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorksheetView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/Private/WorksheetView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/HandlerList.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/HandlerList.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/EventsController.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/EventsController.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script>
......
...@@ -259,7 +259,6 @@ ...@@ -259,7 +259,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/informationFunctions.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/logicalFunctions.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellComment.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Private/CellComment.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Serialize.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/WorkbookElems.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Workbook.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Workbook.js"></script>
...@@ -275,7 +274,6 @@ ...@@ -275,7 +274,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellTextRender.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellTextRender.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellEditorView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellEditorView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorksheetView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorksheetView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/Private/WorksheetView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/HandlerList.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/HandlerList.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/EventsController.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/EventsController.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script>
......
...@@ -419,9 +419,7 @@ ...@@ -419,9 +419,7 @@
<!-- apply changes --> <!-- apply changes -->
<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Locks.js"></script>
<!-- Private -->
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/Locks.js"></script>
<!-- debug begin --> <!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script> <script type="text/javascript">var less=less||{};less.env='development';</script>
......
...@@ -209,19 +209,16 @@ ...@@ -209,19 +209,16 @@
<script type="text/javascript" src="../Excel/utils/utils.js"></script> <script type="text/javascript" src="../Excel/utils/utils.js"></script>
<script type="text/javascript" src="../Excel/model/CellComment.js"></script> <script type="text/javascript" src="../Excel/model/CellComment.js"></script>
<script type="text/javascript" src="../Excel/model/Private/CellComment.js"></script>
<script type="text/javascript" src="../Excel/model/Serialize.js"></script> <script type="text/javascript" src="../Excel/model/Serialize.js"></script>
<script type="text/javascript" src="../Excel/model/WorkbookElems.js"></script> <script type="text/javascript" src="../Excel/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../Excel/model/Workbook.js"></script> <script type="text/javascript" src="../Excel/model/Workbook.js"></script>
<script type="text/javascript" src="../Excel/model/CellInfo.js"></script> <script type="text/javascript" src="../Excel/model/CellInfo.js"></script>
<script type="text/javascript" src="../Excel/model/AdvancedOptions.js"></script> <script type="text/javascript" src="../Excel/model/AdvancedOptions.js"></script>
<script type="text/javascript" src="../Common/Locks.js"></script>
<!-- apply changes --> <!-- apply changes -->
<script type="text/javascript" src="../OfflineDocuments/ApplyDocumentChanges.js"></script> <script type="text/javascript" src="../OfflineDocuments/ApplyDocumentChanges.js"></script>
<!-- Private -->
<script type="text/javascript" src="../Common/Private/Locks.js"></script>
</head> </head>
<body id="id_body" class="block_elem" style="-moz-user-select:none;-khtml-user-select:none;user-select:none;width:100%;height:100%;background-color:#B0B0B0;overflow:hidden;position:fixed;" UNSELECTABLE="on"> <body id="id_body" class="block_elem" style="-moz-user-select:none;-khtml-user-select:none;user-select:none;width:100%;height:100%;background-color:#B0B0B0;overflow:hidden;position:fixed;" UNSELECTABLE="on">
<div id="id_menu" class="block_elem" style="width:100%;height:21mm;background-color:#F4F5F6;"> <div id="id_menu" class="block_elem" style="width:100%;height:21mm;background-color:#F4F5F6;">
......
...@@ -412,16 +412,13 @@ ...@@ -412,16 +412,13 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/utils/utils.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/utils/utils.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellComment.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Private/CellComment.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Serialize.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/WorkbookElems.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Workbook.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellInfo.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/AdvancedOptions.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Locks.js"></script>
<!-- Private -->
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/Locks.js"></script>
<!-- apply changes --> <!-- apply changes -->
<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment